diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0be5cc4..a668e07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,3 +53,12 @@ jobs:
           file: flagd/Dockerfile
           target: ssl
           push: false
+
+      - name: Build flagd-testbed-socket Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: flagd/Dockerfile
+          target: socket
+          push: false
+
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 887d5dd..6506808 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -89,3 +89,14 @@ jobs:
             ${{ env.REGISTRY }}/open-feature/${{ env.FLAGD_IMAGE_NAME }}-ssl:${{ needs.release-please.outputs.release_tag_name }}
             ${{ env.REGISTRY }}/open-feature/${{ env.FLAGD_IMAGE_NAME }}-ssl:latest
 
+      - name: Build and push flagd-testbed-ssl Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: flagd/Dockerfile
+          target: socket
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/open-feature/${{ env.FLAGD_IMAGE_NAME }}-socket:${{ needs.release-please.outputs.release_tag_name }}
+            ${{ env.REGISTRY }}/open-feature/${{ env.FLAGD_IMAGE_NAME }}-socket:latest
+
diff --git a/flagd/Dockerfile b/flagd/Dockerfile
index fe9a5e0..fc8ea74 100644
--- a/flagd/Dockerfile
+++ b/flagd/Dockerfile
@@ -43,3 +43,10 @@ ENTRYPOINT ["./flagd", "start",\
     "-f", "file:testing-flags.json", \
     "-c", "/etc/ssl/certs/server-cert.pem", \
     "-k", "/etc/ssl/private/server-key.pem"]
+
+FROM testbed AS socket
+
+USER 1000:1000
+ENTRYPOINT ["./flagd", "start", "-x",\
+    "-f", "file:testing-flags.json", \
+    "-d", "/tmp/socket.sock"]