diff --git a/.dockerignore b/.dockerignore
index cf25526c..a66409ec 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,7 +10,7 @@ terraform/workspaces/simulator/.terraform/
 .dockerignore
 .editorconfig
 .gitignore
-dev.Dockerfile
+Dockerfile.dev
 Dockerfile
 LICENSE
 Makefile
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fbc35316..50978cd2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -67,7 +67,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./dev.Dockerfile
+          file: ./Dockerfile.dev
           tags: |
             controlplane/simulator:dev
           load: true
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 8ad930fd..2d639d84 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -28,7 +28,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./dev.Dockerfile
+          file: ./Dockerfile.dev
           tags: |
             controlplane/simulator:dev
           load: true
@@ -66,7 +66,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./dev.Dockerfile
+          file: ./Dockerfile.dev
           tags: 'controlplane/simulator:dev'
           load: false ## push and load cannot be set at the same time
           push: true
diff --git a/dev.Dockerfile b/Dockerfile.dev
similarity index 100%
rename from dev.Dockerfile
rename to Dockerfile.dev
diff --git a/Makefile b/Makefile
index 1a734884..f51f5997 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ lint: ## Lint the code
 	golangci-lint run -c .golangci.yml
 
 simulator-dev-image: lint ## Lint the code and build the development Docker image
-	docker build -t $(SIMULATOR_IMAGE):dev -f dev.Dockerfile .
+	docker build -t $(SIMULATOR_IMAGE):dev -f Dockerfile.dev .
 
 simulator-image: simulator-dev-image ## Build the Docker image for the simulator
 	docker build -t $(SIMULATOR_IMAGE) .