diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 264ecb349..60589e4e0 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -150,16 +150,19 @@ jobs:
       fail-fast: false
       matrix:
         image:
+          - acapy-cloud/agent
           - acapy-cloud/app
           - acapy-cloud/endorser
-          - acapy-cloud/governance-agent
           - acapy-cloud/ledger-nodes
-          - acapy-cloud/multitenant-agent
           - acapy-cloud/pytest
           - acapy-cloud/tails-server
           - acapy-cloud/trust-registry
           - acapy-cloud/waypoint
         include:
+          - image: acapy-cloud/agent
+            context: .
+            file: dockerfiles/agents/Dockerfile
+            platforms: linux/amd64 # Pending BBS - linux/arm64
           - image: acapy-cloud/app
             context: .
             file: dockerfiles/app/Dockerfile
@@ -168,18 +171,10 @@ jobs:
             context: .
             file: dockerfiles/endorser/Dockerfile
             platforms: linux/amd64,linux/arm64
-          - image: acapy-cloud/governance-agent
-            context: .
-            file: dockerfiles/agents/Dockerfile.agent
-            platforms: linux/amd64 # Pending BBS - linux/arm64
           - image: acapy-cloud/ledger-nodes
             context: https://github.com/bcgov/von-network.git#v1.8.0
             file: Dockerfile
             platforms: linux/amd64
-          - image: acapy-cloud/multitenant-agent
-            context: .
-            file: dockerfiles/agents/Dockerfile.author.agent
-            platforms: linux/amd64 # Pending BBS - linux/arm64
           - image: acapy-cloud/pytest
             context: .
             file: dockerfiles/tests/Dockerfile
diff --git a/dockerfiles/agents/Dockerfile.author.agent b/dockerfiles/agents/Dockerfile
similarity index 60%
rename from dockerfiles/agents/Dockerfile.author.agent
rename to dockerfiles/agents/Dockerfile
index 6e3b26e9a..fa51ba0df 100644
--- a/dockerfiles/agents/Dockerfile.author.agent
+++ b/dockerfiles/agents/Dockerfile
@@ -15,6 +15,10 @@ RUN chmod +x ./startup.sh
 USER aries
 
 ENTRYPOINT [ "./startup.sh" ]
-CMD [ "--wallet-type", "askar", "--auto-promote-author-did", \
-  "--plugin", "acapy_wallet_groups_plugin", \
-  "--plugin", "nats_events.v1_0.nats_queue.events", "--plugin-config-value", "nats_queue.connection.connection_url=\"nats://nats-1:4222\""]
+## Governance Agent
+CMD [ "--wallet-type", "askar", \
+  "--plugin", "nats_events.v1_0.nats_queue.events", \
+  ## Multitenant Agent
+  #   "--auto-promote-author-did", \
+  #   "--plugin", "acapy_wallet_groups_plugin", \
+  "--plugin-config-value", "nats_queue.connection.connection_url=\"nats://nats-1:4222\""]
diff --git a/dockerfiles/agents/Dockerfile.agent b/dockerfiles/agents/Dockerfile.agent
deleted file mode 100644
index 4bc2cae03..000000000
--- a/dockerfiles/agents/Dockerfile.agent
+++ /dev/null
@@ -1,18 +0,0 @@
-ARG BBS_SUFFIX="-bbs"
-FROM ghcr.io/didx-xyz/acapy-agent${BBS_SUFFIX}:py3.12-1.2.0-20250127
-
-USER root
-
-# Install Google Protobuf
-ARG PROTOBUF_VERSION=5.29.3
-RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION} && \
-  pip install --no-cache-dir git+https://github.com/didx-xyz/aries-acapy-plugins@1.2.0-20250127#subdirectory=nats_events
-
-COPY scripts/startup.sh startup.sh
-RUN chmod +x ./startup.sh
-
-USER aries
-
-ENTRYPOINT [ "./startup.sh" ]
-CMD [ "--wallet-type", "askar", \
-  "--plugin", "nats_events.v1_0.nats_queue.events", "--plugin-config-value", "nats_queue.connection.connection_url=\"nats://nats-1:4222\""]
diff --git a/helm/acapy-cloud/conf/dev/governance-agent.yaml b/helm/acapy-cloud/conf/dev/governance-agent.yaml
index b3aabea0d..a8c36e648 100644
--- a/helm/acapy-cloud/conf/dev/governance-agent.yaml
+++ b/helm/acapy-cloud/conf/dev/governance-agent.yaml
@@ -7,7 +7,7 @@ podAnnotations:
   ad.datadoghq.com/governance-agent.logs: '[{"source": "python", "service": "governance-agent", "auto_multi_line_detection": true}]'
 
 image:
-  name: acapy-cloud/governance-agent
+  name: acapy-cloud/agent
   pullPolicy: Always
   tag: master
 
diff --git a/helm/acapy-cloud/conf/dev/mediator.yaml b/helm/acapy-cloud/conf/dev/mediator.yaml
index 2e5ce9e44..6784aad17 100644
--- a/helm/acapy-cloud/conf/dev/mediator.yaml
+++ b/helm/acapy-cloud/conf/dev/mediator.yaml
@@ -10,7 +10,7 @@ image:
   registry: ghcr.io/openwallet-foundation
   name: acapy-agent
   pullPolicy: Always
-  tag: py3.12-1.2.1
+  tag: py3.12-1.2.2
 
 podLabels:
   admission.datadoghq.com/enabled: "false"
diff --git a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
index 27ee6d997..4ab419762 100644
--- a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
+++ b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
@@ -7,7 +7,7 @@ podAnnotations:
   ad.datadoghq.com/multitenant-agent.logs: '[{"source": "python", "service": "multitenant-agent", "auto_multi_line_detection": true}]'
 
 image:
-  name: acapy-cloud/multitenant-agent
+  name: acapy-cloud/agent
   tag: master
   pullPolicy: Always
 
diff --git a/helm/acapy-cloud/conf/local/governance-agent.yaml b/helm/acapy-cloud/conf/local/governance-agent.yaml
index f5a864f1f..c38c0a202 100644
--- a/helm/acapy-cloud/conf/local/governance-agent.yaml
+++ b/helm/acapy-cloud/conf/local/governance-agent.yaml
@@ -7,7 +7,7 @@ podAnnotations:
   ad.datadoghq.com/governance-agent.logs: '[{"source": "python", "service": "governance-agent", "auto_multi_line_detection": true}]'
 
 image:
-  name: acapy-cloud/governance-agent
+  name: acapy-cloud/agent
   pullPolicy: Always
   tag: master
 
diff --git a/helm/acapy-cloud/conf/local/mediator.yaml b/helm/acapy-cloud/conf/local/mediator.yaml
index ea039f705..21d90e20d 100644
--- a/helm/acapy-cloud/conf/local/mediator.yaml
+++ b/helm/acapy-cloud/conf/local/mediator.yaml
@@ -10,7 +10,7 @@ image:
   registry: ghcr.io/openwallet-foundation
   name: acapy-agent
   pullPolicy: Always
-  tag: py3.12-1.2.1
+  tag: py3.12-1.2.2
 
 podLabels:
   admission.datadoghq.com/enabled: "false"
diff --git a/helm/acapy-cloud/conf/local/multitenant-agent.yaml b/helm/acapy-cloud/conf/local/multitenant-agent.yaml
index bd72c1663..74620eb17 100644
--- a/helm/acapy-cloud/conf/local/multitenant-agent.yaml
+++ b/helm/acapy-cloud/conf/local/multitenant-agent.yaml
@@ -8,7 +8,7 @@ podAnnotations:
   ad.datadoghq.com/multitenant-agent.logs: '[{"source": "python", "service": "multitenant-agent", "auto_multi_line_detection": true}]'
 
 image:
-  name: acapy-cloud/multitenant-agent
+  name: acapy-cloud/agent
   tag: master
   pullPolicy: Always
 
diff --git a/tilt/acapy-cloud/Tiltfile b/tilt/acapy-cloud/Tiltfile
index f30c5e055..9f24a57af 100644
--- a/tilt/acapy-cloud/Tiltfile
+++ b/tilt/acapy-cloud/Tiltfile
@@ -439,7 +439,7 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             ],
             "image": {
-                "dockerfile": "./dockerfiles/agents/Dockerfile.agent",
+                "dockerfile": "./dockerfiles/agents/Dockerfile",
                 "ignore": [
                     "app/**",
                     "endorser/**",
@@ -487,7 +487,7 @@ def setup_cloudapi(build_enabled, expose):
                 ),
             ],
             "image": {
-                "dockerfile": "./dockerfiles/agents/Dockerfile.author.agent",
+                "dockerfile": "./dockerfiles/agents/Dockerfile",
                 "ignore": [
                     "app/**",
                     "endorser/**",