diff --git a/infrastructure/charts/agent/values.yaml b/infrastructure/charts/agent/values.yaml
index a2937a8adb..92a414fc67 100644
--- a/infrastructure/charts/agent/values.yaml
+++ b/infrastructure/charts/agent/values.yaml
@@ -23,7 +23,7 @@ server:
   image:
       repository: ghcr.io
       pullPolicy: IfNotPresent
-      tag: input-output-hk/prism-agent
+      tag: hyperledger/prism-agent
   resources:
     limits:
       cpu: 500m
diff --git a/infrastructure/ci/docker-compose-multiple-actors.yml b/infrastructure/ci/docker-compose-multiple-actors.yml
index 660755415e..a13c64e2d1 100644
--- a/infrastructure/ci/docker-compose-multiple-actors.yml
+++ b/infrastructure/ci/docker-compose-multiple-actors.yml
@@ -82,7 +82,7 @@ services:
   ##########################c
 
   prism-agent-issuer:
-    image: ghcr.io/input-output-hk/prism-agent:0.5.0
+    image: ghcr.io/hyperledger/prism-agent:0.5.0
     environment:
       REST_SERVICE_PORT: 8080
       DIDCOMM_SERVICE_PORT: 8081
@@ -115,7 +115,7 @@ services:
       retries: 5
 
   prism-agent-holder:
-    image: ghcr.io/input-output-hk/prism-agent:0.5.0
+    image: ghcr.io/hyperledger/prism-agent:0.5.0
     environment:
       REST_SERVICE_PORT: 8090
       DIDCOMM_SERVICE_PORT: 8091
diff --git a/infrastructure/dev/get-versions.sh b/infrastructure/dev/get-versions.sh
index ccc91631eb..b301a00281 100755
--- a/infrastructure/dev/get-versions.sh
+++ b/infrastructure/dev/get-versions.sh
@@ -5,8 +5,8 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 # Set working directory
 cd ${SCRIPT_DIR}
 
-export PRISM_AGENT_VERSION=$(cd ../../ && sbt "project agent" -Dsbt.supershell=false -error "print version")
-echo "prism-agent server version: ${PRISM_AGENT_VERSION}"
+export AGENT_VERSION=$(cd ../../ && sbt "project agent" -Dsbt.supershell=false -error "print version")
+echo "prism-agent server version: ${AGENT_VERSION}"
 
 export PRISM_NODE_VERSION=v2.1.1
 echo "prism node version: ${PRISM_NODE_VERSION}"
diff --git a/infrastructure/multi/.env b/infrastructure/multi/.env
index a6c57a3d91..ec1313acb7 100644
--- a/infrastructure/multi/.env
+++ b/infrastructure/multi/.env
@@ -1,2 +1,2 @@
 MERCURY_MEDIATOR_VERSION=0.2.0
-PRISM_AGENT_VERSION=0.6.0
+AGENT_VERSION=0.6.0
diff --git a/infrastructure/shared/docker-compose-demo.yml b/infrastructure/shared/docker-compose-demo.yml
index 2307c08948..0fabd11f0e 100644
--- a/infrastructure/shared/docker-compose-demo.yml
+++ b/infrastructure/shared/docker-compose-demo.yml
@@ -29,7 +29,7 @@ services:
         condition: service_healthy
 
   prism-agent:
-    image: ghcr.io/input-output-hk/prism-agent:${AGENT_VERSION}
+    image: ghcr.io/hyperledger/prism-agent:${AGENT_VERSION}
     environment:
       DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm
       REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/prism-agent
diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml
index aa15f60155..6c395ba1e1 100644
--- a/infrastructure/shared/docker-compose-mt-keycloak.yml
+++ b/infrastructure/shared/docker-compose-mt-keycloak.yml
@@ -70,7 +70,7 @@ services:
       retries: 5
 
   prism-agent:
-    image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
+    image: ghcr.io/hyperledger/prism-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: db
       POLLUX_DB_PORT: 5432
diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
index 01bcd0dd58..d4d8b95da9 100644
--- a/infrastructure/shared/docker-compose.yml
+++ b/infrastructure/shared/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       retries: 5
 
   prism-agent:
-    image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
+    image: ghcr.io/hyperledger/prism-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: db
       POLLUX_DB_PORT: 5432
diff --git a/infrastructure/single-tenant-testing-stack/.env b/infrastructure/single-tenant-testing-stack/.env
index 3d851d1c25..4dafa03681 100644
--- a/infrastructure/single-tenant-testing-stack/.env
+++ b/infrastructure/single-tenant-testing-stack/.env
@@ -1,3 +1,3 @@
-PRISM_AGENT_VERSION=1.25.0
+AGENT_VERSION=1.25.0
 PRISM_NODE_VERSION=2.2.1
 VAULT_DEV_ROOT_TOKEN_ID=root
diff --git a/infrastructure/single-tenant-testing-stack/docker-compose.yml b/infrastructure/single-tenant-testing-stack/docker-compose.yml
index d153375e02..abb7c37f3d 100644
--- a/infrastructure/single-tenant-testing-stack/docker-compose.yml
+++ b/infrastructure/single-tenant-testing-stack/docker-compose.yml
@@ -85,7 +85,7 @@ services:
         condition: service_healthy
 
   issuer-oea:
-    image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
+    image: ghcr.io/input-output-hk/prism-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: issuer-db
       POLLUX_DB_PORT: 5432
@@ -155,7 +155,7 @@ services:
       - 9095:9095
 
   verifier-oea:
-    image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
+    image: ghcr.io/input-output-hk/prism-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: verifier-db
       POLLUX_DB_PORT: 5432
@@ -227,7 +227,7 @@ services:
       - DATA_SOURCE_NAME=postgresql://postgres:postgres@issuer-db:5432/postgres?sslmode=disable
 
   holder-oea:
-    image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
+    image: ghcr.io/input-output-hk/prism-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: holder-db
       POLLUX_DB_PORT: 5432