diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8534340d..1b2758eb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: build-kubegraph-mage
+name: build-kubegraph-image
 
 on:
   workflow_dispatch:
@@ -61,6 +61,7 @@ jobs:
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: ${{ matrix.workdir }}
+          platforms: linux/amd64,linux/arm64,windows/amd64
           file: ${{ matrix.dockerfile }}
           push: true
           build-args: |
@@ -74,6 +75,7 @@ jobs:
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: ${{ matrix.workdir }}
+          platforms: linux/amd64,linux/arm64,windows/amd64
           file: ${{ matrix.dockerfile }}
           push: true
           build-args: |
diff --git a/Makefile b/Makefile
index d0292b98..37e29460 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ ifndef KUBEHOUND_ENV
 endif
 
 ifeq (,$(filter $(SYSTEM_TEST_CMD),$(MAKECMDGOALS)))
-	ifeq (${KUBEHOUND_ENV}, prod)
-		DOCKER_COMPOSE_FILE_PATH += -f deployments/kubehound/docker-compose.prod.yaml
+	ifeq (${KUBEHOUND_ENV}, release)
+		DOCKER_COMPOSE_FILE_PATH += -f deployments/kubehound/docker-compose.release.yaml
 	else ifeq (${KUBEHOUND_ENV}, dev)
 		DOCKER_COMPOSE_FILE_PATH += -f deployments/kubehound/docker-compose.dev.yaml
 	endif
diff --git a/README.md b/README.md
index 51c258c0..787a0939 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,8 @@ Release binaries are available for Linux / Windows / Mac OS via the [releases](h
 ./kubehound.sh backend-up
 ```
 
+*NOTE*: you must have [setup GHCR access](https://codefresh.io/docs/docs/integrations/docker-registries/github-container-registry/)
+
 Next choose a target Kubernetes cluster, either:
 
 * Select the targeted cluster via `kubectx` (need to be installed separately)     
@@ -118,13 +120,12 @@ cp deployments/kubehound/.env.tpl deployments/kubehound/.env
 
 Edit the variables (datadog env `DD_*` related and `KUBEHOUND_ENV`):
 
-* `KUBEHOUND_ENV`: `dev` or `prod` 
+* `KUBEHOUND_ENV`: `dev` or `release` 
 * `DD_API_KEY`: api key you created from https://app.datadoghq.com/ website
 
 Note:
-* `KUBEHOUND_ENV=prod` will use prebuilt image from ghcr.io (:rotating_light: currently NOT supported :rotating_light:)
-* `KUBEHOUND_ENV=dev` will build the images locally
-
+* `KUBEHOUND_ENV=dev` will build the images locally (and provide some local debugging containers e.g `mongo-express`)
+* `KUBEHOUND_ENV=release` will use prebuilt images from ghcr.io 
 
 ### Running Kubehound
 
diff --git a/deployments/kubehound/docker-compose.dev.yaml b/deployments/kubehound/docker-compose.dev.yaml
index dadf5a1a..0a9419c1 100644
--- a/deployments/kubehound/docker-compose.dev.yaml
+++ b/deployments/kubehound/docker-compose.dev.yaml
@@ -8,6 +8,7 @@ services:
       - mongodb_data:/data/db
 
   kubegraph:
+    build: ./kubegraph/
     ports:
       - "127.0.0.1:8182:8182"
       - "127.0.0.1:8099:8099"
diff --git a/deployments/kubehound/docker-compose.release.yaml b/deployments/kubehound/docker-compose.release.yaml
index 629d6253..da612138 100644
--- a/deployments/kubehound/docker-compose.release.yaml
+++ b/deployments/kubehound/docker-compose.release.yaml
@@ -8,7 +8,7 @@ services:
       - mongodb_data:/data/db
 
   kubegraph:
-    image: ghcr.io/datadog/kubehound/kubehound-graph:latest
+    image: ghcr.io/datadog/kubehound-graph:latest
     ports:
       - "127.0.0.1:8182:8182"
       - "127.0.0.1:8099:8099"
diff --git a/deployments/kubehound/docker-compose.testing.yaml b/deployments/kubehound/docker-compose.testing.yaml
index 49ff0bb4..6bf1f253 100644
--- a/deployments/kubehound/docker-compose.testing.yaml
+++ b/deployments/kubehound/docker-compose.testing.yaml
@@ -5,6 +5,7 @@ services:
     ports:
       - "127.0.0.1:27018:27017"
   kubegraph:
+    build: ./kubegraph/
     ports:
       - "127.0.0.1:8183:8182"
 networks:
diff --git a/deployments/kubehound/docker-compose.yaml b/deployments/kubehound/docker-compose.yaml
index 69909040..800aef5d 100644
--- a/deployments/kubehound/docker-compose.yaml
+++ b/deployments/kubehound/docker-compose.yaml
@@ -21,7 +21,6 @@ services:
       retries: 10
 
   kubegraph:
-    build: ./kubegraph/
     restart: unless-stopped
     profiles: ["infra"]
     container_name: ${COMPOSE_PROJECT_NAME}-graphdb
diff --git a/deployments/kubehound/kubegraph/dsl/kubehound/src/test/java/com/datadog/ase/kubehound/KubeHoundDslTest.java b/deployments/kubehound/kubegraph/dsl/kubehound/src/test/java/com/datadog/ase/kubehound/KubeHoundDslTest.java
index 4f96e566..cd98a1d7 100644
--- a/deployments/kubehound/kubegraph/dsl/kubehound/src/test/java/com/datadog/ase/kubehound/KubeHoundDslTest.java
+++ b/deployments/kubehound/kubegraph/dsl/kubehound/src/test/java/com/datadog/ase/kubehound/KubeHoundDslTest.java
@@ -30,5 +30,7 @@
 import static org.junit.Assert.assertTrue;
 
 public class KubeHoundDslTest {
-    
+    /* 
+     * Currently testing handled via project system tests due to additional overhead in building up another KubeHound graph in Java
+     */
 }
\ No newline at end of file