diff --git a/TODO.txt b/TODO.txt
index b05075bd2..1384fe91a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -155,8 +155,9 @@
 * Improve alliance icon DONE 10/2/2024
 * BUG: center button should be disabled select island DONE 10/2/2024
 * BUG: boat icon appears when click inland DONE 10/2/2024
-* BUG: double tap zooms on mobile
 * Make fake humans spawn by their country
+* Auto deploy to dev on commit
+* BUG: double tap zooms on mobile
 * add emoji button
 * make year clock
 * block user inputs if too far behind server
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
new file mode 100644
index 000000000..3a4db0844
--- /dev/null
+++ b/cloudbuild.yaml
@@ -0,0 +1,39 @@
+steps:
+  # Build the Docker image
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/openfrontio/game-server:$TAG_NAME', '.']
+
+  # Push the image to Artifact Registry
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['push', 'us-central1-docker.pkg.dev/$PROJECT_ID/openfrontio/game-server:$TAG_NAME']
+
+  # Prune Docker system on the instance
+  - name: 'gcr.io/cloud-builders/gcloud'
+    entrypoint: 'bash'
+    args:
+      - '-c'
+      - |
+        gcloud compute ssh ${_INSTANCE_NAME} --zone us-central1-a --command 'docker system prune -f -a'
+        gcloud compute ssh ${_INSTANCE_NAME} --zone us-central1-a --command 'docker kill $(docker ps -q)'
+        gcloud compute ssh ${_INSTANCE_NAME} --zone us-central1-a --command 'docker rmi $(docker images -q) -f'
+
+  # Update the GCE instance with the new container image
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args:
+      - 'compute'
+      - 'instances'
+      - 'update-container'
+      - '${_INSTANCE_NAME}'
+      - '--container-image'
+      - 'us-central1-docker.pkg.dev/$PROJECT_ID/openfrontio/game-server:$TAG_NAME'
+      - '--zone=us-central1-a'
+
+substitutions:
+  _INSTANCE_NAME: 'openfrontio-dev-instance' 
+  TAG_NAME: 'dev'
+
+options:
+  substitutionOption: 'ALLOW_LOOSE'
+
+images:
+  - 'us-central1-docker.pkg.dev/$PROJECT_ID/openfrontio/game-server:$TAG_NAME'
\ No newline at end of file