diff --git a/.github/workflows/autogpt-builder-cd.yml b/.github/workflows/autogpt-builder-cd.yml
new file mode 100644
index 0000000000..fc49f6a630
--- /dev/null
+++ b/.github/workflows/autogpt-builder-cd.yml
@@ -0,0 +1,60 @@
+name: AutoGPT Server Docker Build and Deploy
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'rnd/autogpt_builder/**'
+
+env:
+  PROJECT_ID: agpt-dev
+  IMAGE_NAME: agpt-builder-dev
+  REGION: us-central1
+  GKE_CLUSTER: dev-gke-cluster
+  GKE_ZONE: us-central1-a
+  DEPLOYMENT_NAME: autogpt-builder
+  HELM_CHART_PATH: rnd/infra/helm/autogpt-builder
+
+jobs:
+  build-push-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v0.2.1
+        with:
+          project_id: ${{ env.PROJECT_ID }}
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
+
+      - name: Configure Docker
+        run: gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
+
+      - name: Build Docker image
+        working-directory: rnd/autogpt_builder
+        run: docker build -t ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }} .
+
+      - name: Push Docker image
+        run: docker push ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
+
+      - name: Get GKE credentials
+        uses: google-github-actions/get-gke-credentials@v0.2.1
+        with:
+          cluster_name: ${{ env.GKE_CLUSTER }}
+          location: ${{ env.GKE_ZONE }}
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: 'v3.4.0'
+
+      - name: Deploy to GKE
+        run: |
+          helm upgrade --install ${{ env.DEPLOYMENT_NAME }} ${{ env.HELM_CHART_PATH }} \
+            --set image.repository=${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }} \
+            --set image.tag=${{ github.sha }} \
+            --namespace dev-agpt \
+            --create-namespace
\ No newline at end of file
diff --git a/.github/workflows/autogpt-builder-docker.yml b/.github/workflows/autogpt-builder-docker.yml
deleted file mode 100644
index 7e256db5a9..0000000000
--- a/.github/workflows/autogpt-builder-docker.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: AutoGPT Builder Docker
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'rnd/autogpt_builder/**'
-
-defaults:
-  run:
-    shell: bash
-    working-directory: rnd/autogpt_builder
-
-env:
-  PROJECT_ID: agpt-dev
-  IMAGE_NAME: agpt-builder-dev
-  REGION: us-central1
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v0.2.1
-        with:
-          project_id: ${{ env.PROJECT_ID }}
-          service_account_key: ${{ secrets.GCP_SA_KEY }}
-          export_default_credentials: true
-
-      - name: Configure Docker
-        run: gcloud auth configure-docker ${{ env.REGION }}-docker.pkg.dev
-
-      - name: Build Docker image
-        run: docker build -t ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }} .
-
-      - name: Push Docker image
-        run: docker push ${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
\ No newline at end of file
diff --git a/.github/workflows/autogpt-server-docker.yml b/.github/workflows/autogpt-server-cd.yml
similarity index 100%
rename from .github/workflows/autogpt-server-docker.yml
rename to .github/workflows/autogpt-server-cd.yml
diff --git a/rnd/infra/terraform/environments/dev.tfvars b/rnd/infra/terraform/environments/dev.tfvars
index 961729d53a..fccb6b9ba4 100644
--- a/rnd/infra/terraform/environments/dev.tfvars
+++ b/rnd/infra/terraform/environments/dev.tfvars
@@ -58,6 +58,16 @@ role_bindings = {
   ],
   "roles/iam.serviceAccountUser" = [
     "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
+  ],
+  "roles/container.developer" = [
+    "serviceAccount:dev-agpt-server-sa@agpt-dev.iam.gserviceaccount.com",
+    "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
+  ],
+  "roles/storage.objectViewer" = [
+    "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
+  ],
+  "roles/artifactregistry.writer" = [
+    "serviceAccount:dev-agpt-gha-sa@agpt-dev.iam.gserviceaccount.com"
   ]
 }