diff --git a/build_info.json b/build_info.json
index 225e6c59c..6bb5ddd50 100644
--- a/build_info.json
+++ b/build_info.json
@@ -243,14 +243,14 @@
     "agent": {
       "dockerfile-path": "docker/mongodb-agent/Dockerfile.atomic",
       "patch": {
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"],
         "platforms": [
            "linux/amd64"
         ]
       },
       "staging": {
         "sign": true,
-        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
+        "repositories": ["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
         "platforms": [
           "linux/arm64",
           "linux/amd64",
diff --git a/changelog/20250826_feature_migrate_agent_repo.md b/changelog/20250826_feature_migrate_agent_repo.md
new file mode 100644
index 000000000..df07a9995
--- /dev/null
+++ b/changelog/20250826_feature_migrate_agent_repo.md
@@ -0,0 +1,10 @@
+---
+title: migrate agent repo
+kind: feature
+date: 2025-08-26
+---
+
+* MongoDB Agent images have been migrated to new container repository: `quay.io/mongodb/mongodb-agent`.
+  * the agents in the new repository will support the x86-64, ARM64, s390x, and ppc64le architectures. More can be read in the [public docs](https://www.mongodb.com/docs/kubernetes/upcoming/tutorial/plan-k8s-op-container-images/).
+  * operator running >=MCK1.3.0 and static cannot use the agent images from the old container repository `quay.io/mongodb/mongodb-agent-ubi`.
+* `quay.io/mongodb/mongodb-agent-ubi` should not be used anymore, it's only there for backwards compatibility.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 964cb8cf9..a739af3a0 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -87,9 +87,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -110,7 +110,7 @@ spec:
               value: mongodb-kubernetes-operator
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
@@ -131,37 +131,35 @@ spec:
             - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
               value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.12.8669-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.13.8702-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.15.8741-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.17.8771-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.0.8694-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.11.8830-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.12.8846-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.3.8758-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.4.8770-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.6.8796-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.7.8810-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
+              value: "quay.io/mongodb/mongodb-agent:12.0.35.7911-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_13_38_0_9654_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.38.0.9654-1"
+              value: "quay.io/mongodb/mongodb-agent:13.38.0.9654-1"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27
diff --git a/controllers/operator/appdbreplicaset_controller.go b/controllers/operator/appdbreplicaset_controller.go
index 16436be0c..071ba8336 100644
--- a/controllers/operator/appdbreplicaset_controller.go
+++ b/controllers/operator/appdbreplicaset_controller.go
@@ -594,7 +594,7 @@ func (r *ReconcileAppDbReplicaSet) ReconcileAppDB(ctx context.Context, opsManage
 
 		appdbOpts.LegacyMonitoringAgentImage = images.ContainerImage(r.imageUrls, mcoConstruct.AgentImageEnv, legacyMonitoringAgentVersion)
 
-		// AgentImageEnv contains the full container image uri e.g. quay.io/mongodb/mongodb-agent-ubi:107.0.0.8502-1
+		// AgentImageEnv contains the full container image uri e.g. quay.io/mongodb/mongodb-agent:107.0.0.8502-1
 		// In non-static containers we don't ask OM for the correct version, therefore we just rely on the provided
 		// environment variable.
 		appdbOpts.AgentImage = r.imageUrls[mcoConstruct.AgentImageEnv]
diff --git a/controllers/operator/appdbreplicaset_controller_test.go b/controllers/operator/appdbreplicaset_controller_test.go
index 8559cf824..a7aa6f99f 100644
--- a/controllers/operator/appdbreplicaset_controller_test.go
+++ b/controllers/operator/appdbreplicaset_controller_test.go
@@ -442,7 +442,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 				Containers: []corev1.Container{
 					{
 						Name:  "mongodb-agent",
-						Image: "quay.io/mongodb/mongodb-agent-ubi:10",
+						Image: "quay.io/mongodb/mongodb-agent:10",
 					},
 					{
 						Name:  "mongod",
@@ -450,7 +450,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 					},
 					{
 						Name:  "mongodb-agent-monitoring",
-						Image: "quay.io/mongodb/mongodb-agent-ubi:20",
+						Image: "quay.io/mongodb/mongodb-agent:20",
 					},
 				},
 			},
@@ -466,7 +466,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 		foundImages := 0
 		for _, c := range appDbSts.Spec.Template.Spec.Containers {
 			if c.Name == "mongodb-agent" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:10", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongod" {
@@ -474,7 +474,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 				foundImages += 1
 			}
 			if c.Name == "mongodb-agent-monitoring" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:20", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:20", c.Image)
 				foundImages += 1
 			}
 		}
@@ -492,7 +492,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 		foundImages := 0
 		for _, c := range appDbSts.Spec.Template.Spec.Containers {
 			if c.Name == "mongodb-agent" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:10", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:10", c.Image)
 				foundImages += 1
 			}
 			if c.Name == "mongod" {
@@ -500,7 +500,7 @@ func TestTryConfigureMonitoringInOpsManagerWithCustomTemplate(t *testing.T) {
 				foundImages += 1
 			}
 			if c.Name == "mongodb-agent-monitoring" {
-				assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:20", c.Image)
+				assert.Equal(t, "quay.io/mongodb/mongodb-agent:20", c.Image)
 				foundImages += 1
 			}
 		}
diff --git a/controllers/operator/mongodbmultireplicaset_controller_test.go b/controllers/operator/mongodbmultireplicaset_controller_test.go
index 21a6b1c99..9766d7c7a 100644
--- a/controllers/operator/mongodbmultireplicaset_controller_test.go
+++ b/controllers/operator/mongodbmultireplicaset_controller_test.go
@@ -138,7 +138,7 @@ func TestMultiReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}
diff --git a/controllers/operator/mongodbopsmanager_controller_test.go b/controllers/operator/mongodbopsmanager_controller_test.go
index 07291dabb..2631f69c9 100644
--- a/controllers/operator/mongodbopsmanager_controller_test.go
+++ b/controllers/operator/mongodbopsmanager_controller_test.go
@@ -551,7 +551,7 @@ func TestOpsManagerReconcileContainerImagesWithStaticArchitecture(t *testing.T)
 
 		// AppDB images
 		mongodbRelatedImageEnv:          "quay.io/mongodb/mongodb-enterprise-appdb-database-ubi@sha256:MONGODB_SHA",
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 	}
 
 	ctx := context.Background()
diff --git a/controllers/operator/mongodbreplicaset_controller_test.go b/controllers/operator/mongodbreplicaset_controller_test.go
index 64c3f724c..f6aea38c8 100644
--- a/controllers/operator/mongodbreplicaset_controller_test.go
+++ b/controllers/operator/mongodbreplicaset_controller_test.go
@@ -129,7 +129,7 @@ func TestReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t *test
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}
@@ -157,7 +157,7 @@ func TestReplicaSetClusterReconcileContainerImagesWithStaticArchitecture(t *test
 func VerifyStaticContainers(t *testing.T, containers []corev1.Container) {
 	agentContainerImage := findContainerImage(containers, util.AgentContainerName)
 	require.NotNil(t, agentContainerImage, "Agent container not found")
-	assert.Equal(t, "quay.io/mongodb/mongodb-agent-ubi:12.0.30.7791-1", agentContainerImage)
+	assert.Equal(t, "quay.io/mongodb/mongodb-agent:12.0.30.7791-1", agentContainerImage)
 
 	mongoContainerImage := findContainerImage(containers, util.DatabaseContainerName)
 	require.NotNil(t, mongoContainerImage, "MongoDB container not found")
diff --git a/controllers/operator/mongodbshardedcluster_controller_test.go b/controllers/operator/mongodbshardedcluster_controller_test.go
index 3fc1547e4..12ca849b8 100644
--- a/controllers/operator/mongodbshardedcluster_controller_test.go
+++ b/controllers/operator/mongodbshardedcluster_controller_test.go
@@ -294,7 +294,7 @@ func TestShardedClusterReconcileContainerImagesWithStaticArchitecture(t *testing
 	sc := test.DefaultClusterBuilder().SetVersion("8.0.0").SetShardCountSpec(1).Build()
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}
diff --git a/controllers/operator/mongodbstandalone_controller_test.go b/controllers/operator/mongodbstandalone_controller_test.go
index f6438ed68..69bdfbb87 100644
--- a/controllers/operator/mongodbstandalone_controller_test.go
+++ b/controllers/operator/mongodbstandalone_controller_test.go
@@ -109,7 +109,7 @@ func TestStandaloneClusterReconcileContainerImagesWithStaticArchitecture(t *test
 	databaseRelatedImageEnv := fmt.Sprintf("RELATED_IMAGE_%s_8_0_0_ubi9", mcoConstruct.MongodbImageEnv)
 
 	imageUrlsMock := images.ImageUrls{
-		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent-ubi",
+		architectures.MdbAgentImageRepo: "quay.io/mongodb/mongodb-agent",
 		mcoConstruct.MongodbImageEnv:    "quay.io/mongodb/mongodb-enterprise-server",
 		databaseRelatedImageEnv:         "quay.io/mongodb/mongodb-enterprise-server:@sha256:MONGODB_DATABASE",
 	}
diff --git a/docker/mongodb-agent/Dockerfile.atomic b/docker/mongodb-agent/Dockerfile.atomic
index 335407a98..15458c4e4 100644
--- a/docker/mongodb-agent/Dockerfile.atomic
+++ b/docker/mongodb-agent/Dockerfile.atomic
@@ -20,8 +20,11 @@ RUN case ${TARGETPLATFORM} in \
     && mkdir -p /tools \
     && curl -o /tools/mongodb_tools.tgz "${mongodb_tools_url}/${MONGODB_TOOLS_VERSION}"
 
-RUN tar xfz /tools/mongodb_tools.tgz --directory /tools \
-    && rm /tools/mongodb_tools.tgz
+RUN tar xfz /tools/mongodb_tools.tgz \
+    && mv mongodb-database-tools-*/bin/* /tools \
+    && chmod +x /tools/* \
+    && rm /tools/mongodb_tools.tgz \
+    && rm -r mongodb-database-tools-*
 
 FROM --platform=${BUILDPLATFORM} registry.access.redhat.com/ubi9/ubi-minimal AS agent_downloader
 
diff --git a/docker/mongodb-agent/README.md b/docker/mongodb-agent/README.md
index a447d60f0..75f65c47a 100644
--- a/docker/mongodb-agent/README.md
+++ b/docker/mongodb-agent/README.md
@@ -8,13 +8,30 @@ binaries from there. Then we continue with the other steps to fully build the im
 For building the MongoDB Agent image locally use the example command:
 
 ```bash
-VERSION="108.0.7.8810-1"
-INIT_DATABASE_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-kubernetes-init-database:1.1.0"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-MONGODB_AGENT_URL_UBI="https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-108.0.7.8810-1.rhel9_x86_64.tar.gz"
-docker buildx build --load --progress plain . -f docker/mongodb-agent/Dockerfile -t "mongodb-agent:${VERSION}_1.1.0" \
- --build-arg version="${VERSION}" \
- --build-arg init_database_image="${INIT_DATABASE_IMAGE}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}" \
- --build-arg mongodb_agent_url_ubi="${MONGODB_AGENT_URL_UBI}"
+VERSION="1.3.0"
+AGENT_VERSION="108.0.7.8810-1"
+TOOLS_VERSION="100.12.0"
+MONGODB_TOOLS_URL="https://downloads.mongodb.org/tools/db"
+MONGODB_AGENT_URL="https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod"
+INIT_DATABASE_IMAGE="${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}"
+MONGODB_AGENT_BASE="mongodb-mms-automation-agent"
+MONGODB_DATABASE_TOOLS_BASE="mongodb-database-tools"
+
+
+docker buildx build --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-agent/Dockerfile -t "${BASE_REPO_URL}mongodb-agent:${AGENT_VERSION}_${VERSION}" \
+    --build-arg version="${VERSION}" \
+    --build-arg init_database_image="${INIT_DATABASE_IMAGE}" \
+    --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL}" \
+    --build-arg mongodb_agent_url="${MONGODB_AGENT_URL}" \
+    --build-arg mongodb_agent_version_s390x="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.rhel7_s390x.tar.gz" \
+    --build-arg mongodb_agent_version_ppc64le="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.rhel8_ppc64le.tar.gz" \
+    --build-arg mongodb_agent_version_amd64="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.linux_x86_64.tar.gz" \
+    --build-arg mongodb_agent_version_arm64="${MONGODB_AGENT_BASE}-${AGENT_VERSION}.amzn2_aarch64.tar.gz" \
+    --build-arg mongodb_tools_version_arm64="${MONGODB_DATABASE_TOOLS_BASE}-rhel93-aarch64-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_amd64="${MONGODB_DATABASE_TOOLS_BASE}-rhel93-x86_64-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_s390x="${MONGODB_DATABASE_TOOLS_BASE}-rhel9-s390x-${TOOLS_VERSION}.tgz" \
+    --build-arg mongodb_tools_version_ppc64le="${MONGODB_DATABASE_TOOLS_BASE}-rhel9-ppc64le-${TOOLS_VERSION}.tgz"
+
+docker push "${BASE_REPO_URL}mongodb-agent:${AGENT_VERSION}_${VERSION}"
+
 ```
diff --git a/docker/mongodb-kubernetes-database/README.md b/docker/mongodb-kubernetes-database/README.md
index e7b937e0e..6264e3d56 100644
--- a/docker/mongodb-kubernetes-database/README.md
+++ b/docker/mongodb-kubernetes-database/README.md
@@ -39,7 +39,7 @@ this images with.
 For building the MongoDB Database image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-database/Dockerfile -t "mongodb-kubernetes-database:${VERSION}" \
+VERSION="1.3.0"
+docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-database/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-database:${VERSION}" \
  --build-arg VERSION="${VERSION}"
 ```
diff --git a/docker/mongodb-kubernetes-init-appdb/README.md b/docker/mongodb-kubernetes-init-appdb/README.md
index d49ca4b3a..9440e8e90 100644
--- a/docker/mongodb-kubernetes-init-appdb/README.md
+++ b/docker/mongodb-kubernetes-init-appdb/README.md
@@ -3,9 +3,13 @@
 For building the MongoDB Init AppDB image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-appdb/Dockerfile -t "mongodb-kubernetes-init-appdb:${VERSION}" \
+VERSION="1.3.0"
+MONGODB_TOOLS_URL="https://downloads.mongodb.org/tools/db"
+docker buildx build --load --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-init-appdb/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-init-appdb:${VERSION}" \
  --build-arg version="${VERSION}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+ --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL_UBI}" \
+ --build-arg mongodb_tools_version_arm64="mongodb-database-tools-rhel93-aarch64-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_amd64="mongodb-database-tools-rhel93-x86_64-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_s390x="mongodb-database-tools-rhel9-s390x-100.12.0.tgz" \
+ --build-arg mongodb_tools_version_ppc64le="mongodb-database-tools-rhel9-ppc64le-100.12.0.tgz"
 ```
diff --git a/docker/mongodb-kubernetes-init-database/README.md b/docker/mongodb-kubernetes-init-database/README.md
index 0e6657531..2ee22ed21 100644
--- a/docker/mongodb-kubernetes-init-database/README.md
+++ b/docker/mongodb-kubernetes-init-database/README.md
@@ -3,9 +3,19 @@
 For building the MongoDB Init AppDB image locally use the example command:
 
 ```bash
-VERSION="1.0.1"
-MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db/mongodb-database-tools-rhel93-x86_64-100.12.0.tgz"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-init-database/Dockerfile -t "mongodb-kubernetes-init-database:${VERSION}" \
+VERSION="1.3.0"
+TOOLS_VERSION="100.12.0"
+MONGODB_TOOLS_URL_UBI="https://downloads.mongodb.org/tools/db"
+docker buildx build --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-init-database/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}" \
  --build-arg version="${VERSION}" \
- --build-arg mongodb_tools_url_ubi="${MONGODB_TOOLS_URL_UBI}"
+ --build-arg mongodb_tools_url="${MONGODB_TOOLS_URL_UBI}" \
+ --build-arg mongodb_tools_version_arm64="mongodb-database-tools-rhel93-aarch64-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_amd64="mongodb-database-tools-rhel93-x86_64-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_s390x="mongodb-database-tools-rhel9-s390x-${TOOLS_VERSION}.tgz" \
+ --build-arg mongodb_tools_version_ppc64le="mongodb-database-tools-rhel9-ppc64le-${TOOLS_VERSION}.tgz"
+
+docker push "${BASE_REPO_URL}mongodb-kubernetes-init-database:${VERSION}"
 ```
+
+first no cache 2:20.28 total
+second no cache 2:31.74 total
diff --git a/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh b/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
index 7bdf8164c..f565a63ea 100755
--- a/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
+++ b/docker/mongodb-kubernetes-init-database/content/agent-launcher.sh
@@ -206,10 +206,10 @@ else
     ln -sf "${MONGOD_ROOT}/bin/mongod" ${mdb_downloads_dir}/mongod/bin/mongod
     ln -sf "${MONGOD_ROOT}/bin/mongos" ${mdb_downloads_dir}/mongod/bin/mongos
 
-    ln -sf "/tools/mongodump" ${mdb_downloads_dir}/mongod/bin/mongodump
-    ln -sf "/tools/mongorestore" ${mdb_downloads_dir}/mongod/bin/mongorestore
-    ln -sf "/tools/mongoexport" ${mdb_downloads_dir}/mongod/bin/mongoexport
-    ln -sf "/tools/mongoimport" ${mdb_downloads_dir}/mongod/bin/mongoimport
+    for tool in mongoimport mongodump mongorestore mongoexport; do
+      [ -e "/tools/${tool}" ] || { echo "/tools/${tool} not found"; exit 1; }
+      ln -sf "/tools/${tool}" ${mdb_downloads_dir}/mongod/bin/${tool}
+    done
   else
     echo "Mongod PID not found within the specified time."
     exit 1
diff --git a/docker/mongodb-kubernetes-operator/README.md b/docker/mongodb-kubernetes-operator/README.md
index 8335c1d79..8aef617ad 100644
--- a/docker/mongodb-kubernetes-operator/README.md
+++ b/docker/mongodb-kubernetes-operator/README.md
@@ -13,13 +13,15 @@ CGO_ENABLED=0 GOOS=linux GOFLAGS="-mod=vendor" go build -i -o mongodb-kubernetes
 For building the MongoDB Init Ops Manager image locally use the example command:
 
 ```bash
-VERSION="1.1.0"
+VERSION="1.3.0"
 LOG_AUTOMATION_CONFIG_DIFF="false"
 USE_RACE="false"
-docker buildx build --load --progress plain . -f docker/mongodb-kubernetes-operator/Dockerfile -t "mongodb-kubernetes-operator:${VERSION}" \
+docker buildx build --load --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f docker/mongodb-kubernetes-operator/Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes:${VERSION}" \
  --build-arg version="${VERSION}" \
  --build-arg log_automation_config_diff="${LOG_AUTOMATION_CONFIG_DIFF}" \
  --build-arg use_race="${USE_RACE}"
+
+docker push "${BASE_REPO_URL}mongodb-kubernetes:${VERSION}"
 ```
 
 ### Running locally
diff --git a/docker/mongodb-kubernetes-tests/README.md b/docker/mongodb-kubernetes-tests/README.md
index dec9ac764..736434b59 100644
--- a/docker/mongodb-kubernetes-tests/README.md
+++ b/docker/mongodb-kubernetes-tests/README.md
@@ -106,6 +106,17 @@ indicate which test classes need to be run. But for now they help us
 to call a particular E2E task we are interested in.
 
 
+## Building test image
+
+```bash
+make prepare-local-e2e
+cd docker/mongodb-kubernetes-tests
+docker buildx build --progress plain --platform linux/amd64,linux/arm64,linux/s390x,linux/ppc64le . -f Dockerfile -t "${BASE_REPO_URL}mongodb-kubernetes-tests:evergreen" \
+ --build-arg PYTHON_VERSION="3.13"
+
+docker push "${BASE_REPO_URL}mongodb-kubernetes-tests:evergreen"
+```
+
 # Writing New Tests #
 
 ### Create a new Python test file ###
diff --git a/docs/community-search/quick-start/output/0100_install_operator.out b/docs/community-search/quick-start/output/0100_install_operator.out
index 035e24e8a..c54b9c92e 100644
--- a/docs/community-search/quick-start/output/0100_install_operator.out
+++ b/docs/community-search/quick-start/output/0100_install_operator.out
@@ -10,11 +10,11 @@ dummy: value
 
 COMPUTED VALUES:
 agent:
-  name: mongodb-agent-ubi
+  name: mongodb-agent
   version: 108.0.2.8729-1
 community:
   agent:
-    name: mongodb-agent-ubi
+    name: mongodb-agent
     version: 108.0.2.8729-1
   mongodb:
     imageType: ubi8
@@ -510,9 +510,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -531,7 +531,7 @@ spec:
               value: mongodb-kubernetes-operator
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
diff --git a/generate_ssdlc_report.py b/generate_ssdlc_report.py
index 89183d033..9954f2f08 100755
--- a/generate_ssdlc_report.py
+++ b/generate_ssdlc_report.py
@@ -97,8 +97,8 @@ def get_supported_images(release: Dict) -> dict[str, SupportedImage]:
     supported_images = convert_to_image_names(supported_images)
     supported_images["mongodb-agent-ubi"] = SupportedImage(
         get_supported_version_for_image("mongodb-agent"),
-        "mongodb-agent-ubi",
-        "quay.io/mongodb/mongodb-agent-ubi",
+        "mongodb-agent",
+        "quay.io/mongodb/mongodb-agent",
         release["supportedImages"]["mongodb-agent"]["ssdlc_name"],
         list(),
         # Once MCK supports both architectures, this should be re-enabled.
diff --git a/helm_chart/values-openshift.yaml b/helm_chart/values-openshift.yaml
index a9996102b..bf568af92 100644
--- a/helm_chart/values-openshift.yaml
+++ b/helm_chart/values-openshift.yaml
@@ -112,7 +112,6 @@ relatedImages:
   - 108.0.4.8770-1
   - 108.0.6.8796-1
   - 108.0.7.8810-1
-  - 12.0.34.7888-1
   - 12.0.35.7911-1
   - 13.38.0.9654-1
   mongodbLegacyAppDb:
diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml
index 0a44d5ca0..30d9ecb69 100644
--- a/helm_chart/values.yaml
+++ b/helm_chart/values.yaml
@@ -143,7 +143,7 @@ initAppDb:
   version: 1.2.0
 
 agent:
-  name: mongodb-agent-ubi
+  name: mongodb-agent
   version: 108.0.2.8729-1
 
 # This is only used by the MongoDBCommunity resource reconciler - START
@@ -196,7 +196,7 @@ community:
     name: mongodb-community-server
     imageType: ubi8
   agent:
-    name: mongodb-agent-ubi
+    name: mongodb-agent
     version: 108.0.2.8729-1
   registry:
     agent: quay.io/mongodb
diff --git a/inventories/agent.yaml b/inventories/agent.yaml
index bcb2d5889..6601c7363 100644
--- a/inventories/agent.yaml
+++ b/inventories/agent.yaml
@@ -1,5 +1,5 @@
 vars:
-  quay_registry: quay.io/mongodb/mongodb-agent-ubi
+  quay_registry: quay.io/mongodb/mongodb-agent
   s3_bucket: s3://enterprise-operator-dockerfiles/dockerfiles/mongodb-agent
 
 images:
diff --git a/mongodb-community-operator/config/manager/manager.yaml b/mongodb-community-operator/config/manager/manager.yaml
index 9013a8451..4f64da811 100644
--- a/mongodb-community-operator/config/manager/manager.yaml
+++ b/mongodb-community-operator/config/manager/manager.yaml
@@ -45,7 +45,7 @@ spec:
         - name: OPERATOR_NAME
           value: mongodb-kubernetes-operator
         - name: AGENT_IMAGE
-          value: quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1
+          value: quay.io/mongodb/mongodb-agent:108.0.2.8729-1
         - name: VERSION_UPGRADE_HOOK_IMAGE
           value: quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9
         - name: READINESS_PROBE_IMAGE
diff --git a/mongodb-community-operator/deploy/openshift/operator_openshift.yaml b/mongodb-community-operator/deploy/openshift/operator_openshift.yaml
index c0f3cf1ce..557074846 100644
--- a/mongodb-community-operator/deploy/openshift/operator_openshift.yaml
+++ b/mongodb-community-operator/deploy/openshift/operator_openshift.yaml
@@ -47,7 +47,7 @@ spec:
         - name: OPERATOR_NAME
           value: mongodb-kubernetes-operator
         - name: AGENT_IMAGE
-          value: quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1
+          value: quay.io/mongodb/mongodb-agent:108.0.2.8729-1
         - name: READINESS_PROBE_IMAGE
           value: quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.22
         - name: VERSION_UPGRADE_HOOK_IMAGE
diff --git a/mongodb-community-operator/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go b/mongodb-community-operator/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go
index 0625d70f5..98ee9f385 100644
--- a/mongodb-community-operator/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go
+++ b/mongodb-community-operator/test/e2e/replica_set_operator_upgrade/replica_set_operator_upgrade_test.go
@@ -163,7 +163,7 @@ func TestReplicaSetOperatorUpgradeFrom0_7_2(t *testing.T) {
 	testConfig.OperatorVersion = "0.7.2"
 	testConfig.VersionUpgradeHookImage = "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.3"
 	testConfig.ReadinessProbeImage = "quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.6"
-	testConfig.AgentImage = "quay.io/mongodb/mongodb-agent-ubi:11.0.5.6963-1"
+	testConfig.AgentImage = "quay.io/mongodb/mongodb-agent:11.0.5.6963-1"
 
 	testCtx := setup.SetupWithTestConfig(ctx, t, testConfig, true, false, resourceName)
 	defer testCtx.Teardown()
diff --git a/mongodb-community-operator/test/e2e/setup/test_config.go b/mongodb-community-operator/test/e2e/setup/test_config.go
index 57fd71d3e..399155a12 100644
--- a/mongodb-community-operator/test/e2e/setup/test_config.go
+++ b/mongodb-community-operator/test/e2e/setup/test_config.go
@@ -48,7 +48,7 @@ func LoadTestConfigFromEnv() TestConfig {
 		MongoDBRepoUrl:          envvar.GetEnvOrDefault(construct.MongodbRepoUrlEnv, "quay.io/mongodb"),                                                                            // nolint:forbidigo
 		VersionUpgradeHookImage: envvar.GetEnvOrDefault(construct.VersionUpgradeHookImageEnv, "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.2"), // nolint:forbidigo
 		// TODO: MCK better way to decide default agent image.
-		AgentImage:          envvar.GetEnvOrDefault("MDB_COMMUNITY_AGENT_IMAGE", "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"),             // nolint:forbidigo
+		AgentImage:          envvar.GetEnvOrDefault("MDB_COMMUNITY_AGENT_IMAGE", "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"),                 // nolint:forbidigo
 		ClusterWide:         envvar.ReadBool(clusterWideEnvName),                                                                                 // nolint:forbidigo
 		PerformCleanup:      envvar.ReadBool(performCleanupEnvName),                                                                              // nolint:forbidigo
 		ReadinessProbeImage: envvar.GetEnvOrDefault(construct.ReadinessProbeImageEnv, "quay.io/mongodb/mongodb-kubernetes-readinessprobe:1.0.3"), // nolint:forbidigo
diff --git a/pkg/util/architectures/static.go b/pkg/util/architectures/static.go
index dc398dabe..40d7f177a 100644
--- a/pkg/util/architectures/static.go
+++ b/pkg/util/architectures/static.go
@@ -41,7 +41,7 @@ const (
 	MdbAssumeEnterpriseImage = "MDB_ASSUME_ENTERPRISE_IMAGE"
 	// MdbAgentImageRepo contains the repository containing the agent image for the database
 	MdbAgentImageRepo        = "MDB_AGENT_IMAGE_REPOSITORY"
-	MdbAgentImageRepoDefault = "quay.io/mongodb/mongodb-agent-ubi"
+	MdbAgentImageRepoDefault = "quay.io/mongodb/mongodb-agent"
 )
 
 // IsRunningStaticArchitecture checks whether the operator is running in static or non-static mode.
diff --git a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out
index cc5174432..7627b0a11 100644
--- a/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out
+++ b/public/architectures/setup-multi-cluster/setup-operator/output/0210_helm_install_operator.out
@@ -23,11 +23,11 @@ operator:
 
 COMPUTED VALUES:
 agent:
-  name: mongodb-agent-ubi
+  name: mongodb-agent
   version: 108.0.2.8729-1
 community:
   agent:
-    name: mongodb-agent-ubi
+    name: mongodb-agent
     version: 108.0.2.8729-1
   mongodb:
     imageType: ubi8
@@ -331,9 +331,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -352,7 +352,7 @@ spec:
               value: mongodb-kubernetes-operator-multi-cluster
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
diff --git a/public/mongodb-kubernetes-multi-cluster.yaml b/public/mongodb-kubernetes-multi-cluster.yaml
index f53630a0e..2f4099ab8 100644
--- a/public/mongodb-kubernetes-multi-cluster.yaml
+++ b/public/mongodb-kubernetes-multi-cluster.yaml
@@ -398,9 +398,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -419,7 +419,7 @@ spec:
               value: mongodb-kubernetes-operator-multi-cluster
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml
index a97925761..cc92133c7 100644
--- a/public/mongodb-kubernetes-openshift.yaml
+++ b/public/mongodb-kubernetes-openshift.yaml
@@ -393,9 +393,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -414,7 +414,7 @@ spec:
               value: mongodb-kubernetes-operator
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
@@ -435,37 +435,35 @@ spec:
             - name: RELATED_IMAGE_INIT_APPDB_IMAGE_REPOSITORY_1_2_0
               value: "quay.io/mongodb/mongodb-kubernetes-init-appdb:1.2.0"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_12_8669_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.12.8669-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.12.8669-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_13_8702_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.13.8702-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.13.8702-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_15_8741_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.15.8741-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.15.8741-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_17_8771_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:107.0.17.8771-1"
+              value: "quay.io/mongodb/mongodb-agent:107.0.17.8771-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_0_8694_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.0.8694-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.0.8694-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.1.8718-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.11.8830-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.11.8830-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_12_8846_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.12.8846-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.12.8846-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.3.8758-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.3.8758-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_4_8770_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.4.8770-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.4.8770-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_6_8796_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.6.8796-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.6.8796-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_7_8810_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.7.8810-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_12_0_34_7888_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.34.7888-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.7.8810-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:12.0.35.7911-1"
+              value: "quay.io/mongodb/mongodb-agent:12.0.35.7911-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_13_38_0_9654_1
-              value: "quay.io/mongodb/mongodb-agent-ubi:13.38.0.9654-1"
+              value: "quay.io/mongodb/mongodb-agent:13.38.0.9654-1"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27
diff --git a/public/mongodb-kubernetes.yaml b/public/mongodb-kubernetes.yaml
index 69ff3f0e8..ed6024f98 100644
--- a/public/mongodb-kubernetes.yaml
+++ b/public/mongodb-kubernetes.yaml
@@ -394,9 +394,9 @@ spec:
             - name: OPS_MANAGER_IMAGE_PULL_POLICY
               value: Always
             - name: AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: MDB_AGENT_IMAGE_REPOSITORY
-              value: "quay.io/mongodb/mongodb-agent-ubi"
+              value: "quay.io/mongodb/mongodb-agent"
             - name: MONGODB_IMAGE
               value: mongodb-enterprise-server
             - name: MONGODB_REPO_URL
@@ -415,7 +415,7 @@ spec:
               value: mongodb-kubernetes-operator
             # Community Env Vars Start
             - name: MDB_COMMUNITY_AGENT_IMAGE
-              value: "quay.io/mongodb/mongodb-agent-ubi:108.0.2.8729-1"
+              value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: VERSION_UPGRADE_HOOK_IMAGE
               value: "quay.io/mongodb/mongodb-kubernetes-operator-version-upgrade-post-start-hook:1.0.9"
             - name: READINESS_PROBE_IMAGE
diff --git a/release.json b/release.json
index e8c0ef573..e86f55752 100644
--- a/release.json
+++ b/release.json
@@ -109,10 +109,6 @@
         "cloud_manager": "13.38.0.9654-1",
         "cloud_manager_tools": "100.12.2",
         "ops_manager": {
-          "6.0.26": {
-            "agent_version": "12.0.34.7888-1",
-            "tools_version": "100.10.0"
-          },
           "6.0.27": {
             "agent_version": "12.0.35.7911-1",
             "tools_version": "100.10.0"
diff --git a/scripts/dev/contexts/evg-private-context b/scripts/dev/contexts/evg-private-context
index 8f25842e8..c8bab1176 100644
--- a/scripts/dev/contexts/evg-private-context
+++ b/scripts/dev/contexts/evg-private-context
@@ -47,7 +47,7 @@ export OPS_MANAGER_REGISTRY=${QUAY_REGISTRY}
 export APPDB_REGISTRY=${QUAY_REGISTRY}
 export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
 export INIT_DATABASE_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-database"
-export MDB_AGENT_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-agent-ubi"
+export MDB_AGENT_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-agent"
 
 # these are needed to deploy OM
 export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"
diff --git a/scripts/dev/contexts/local-defaults-context b/scripts/dev/contexts/local-defaults-context
index 36d652d55..b876314b7 100644
--- a/scripts/dev/contexts/local-defaults-context
+++ b/scripts/dev/contexts/local-defaults-context
@@ -39,9 +39,9 @@ export MONGODB_REPO_URL="${QUAY_REGISTRY}"
 export APPDB_REGISTRY="${QUAY_REGISTRY}"
 export MONGODB_ENTERPRISE_DATABASE_IMAGE="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-database"
 export MDB_AGENT_IMAGE_OPERATOR_VERSION=latest
-export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent-ubi"
+export MDB_AGENT_IMAGE_REPOSITORY="${BASE_REPO_URL_SHARED}/mongodb-agent"
 export AGENT_BASE_REGISTRY=${BASE_REPO_URL_SHARED}
-export AGENT_IMAGE="268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi:12.0.30.7791-1"
+export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:12.0.35.7911-1"
 
 # these are needed to deploy OM
 export INIT_APPDB_IMAGE_REPOSITORY="${INIT_IMAGES_REGISTRY}/mongodb-kubernetes-init-appdb"
diff --git a/scripts/dev/contexts/variables/om60 b/scripts/dev/contexts/variables/om60
index fde83eb09..a9df4cdcc 100644
--- a/scripts/dev/contexts/variables/om60
+++ b/scripts/dev/contexts/variables/om60
@@ -13,9 +13,6 @@ export CUSTOM_OM_VERSION
 export CUSTOM_MDB_VERSION=6.0.21
 export CUSTOM_MDB_PREV_VERSION=5.0.7
 
-export AGENT_VERSION=12.0.35.7911-1
-export AGENT_IMAGE="${MDB_AGENT_IMAGE_REPOSITORY}:${AGENT_VERSION}"
-
 export CUSTOM_APPDB_VERSION=6.0.21-ent
 export TEST_MODE=opsmanager
 export OPS_MANAGER_REGISTRY=268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
diff --git a/scripts/dev/release/backup_csv_images.py b/scripts/dev/release/backup_csv_images.py
index 9ad3ec78b..e8a35ee00 100755
--- a/scripts/dev/release/backup_csv_images.py
+++ b/scripts/dev/release/backup_csv_images.py
@@ -148,12 +148,12 @@ def parse_image_url(image_url: str) -> tuple[str, str, str]:
     """Parse a digest-pinned image URL into registry, repository, and digest components.
 
     Args:
-        image_url: The digest-pinned image URL (e.g., 'quay.io/mongodb/mongodb-agent-ubi@sha256:abc123')
+        image_url: The digest-pinned image URL (e.g., 'quay.io/mongodb/mongodb-agent@sha256:abc123')
 
     Returns:
         A tuple of (registry, repository, digest)
         - registry: The registry part (e.g., 'quay.io')
-        - repository: The repository path (e.g., 'mongodb/mongodb-agent-ubi')
+        - repository: The repository path (e.g., 'mongodb/mongodb-agent')
         - digest: The image digest (e.g., 'sha256:abc123')
     """
 
@@ -186,7 +186,7 @@ def generate_backup_tag(original_image: str, original_tag: str, mck_version: str
     """
     try:
         # Extract the repository name (last part of the image path)
-        # Example: 'quay.io/mongodb/mongodb-agent-ubi' -> 'mongodb-agent-ubi'
+        # Example: 'quay.io/mongodb/mongodb-agent' -> 'mongodb-agent-ubi'
         repo_name = original_image.split("@")[0].split("/")[-1]
         return f"quay.io/mongodb/{repo_name}:{original_tag}_openshift_{mck_version}"
     except Exception as e:
diff --git a/scripts/dev/release/test_backup_script.py b/scripts/dev/release/test_backup_script.py
index 7625972f0..db9eea991 100644
--- a/scripts/dev/release/test_backup_script.py
+++ b/scripts/dev/release/test_backup_script.py
@@ -46,7 +46,7 @@ def get_test_csv():
                                                     },
                                                     {
                                                         "name": "RELATED_IMAGE_AGENT",
-                                                        "value": "quay.io/mongodb/mongodb-agent-ubi@sha256:ghi789jkl012",
+                                                        "value": "quay.io/mongodb/mongodb-agent@sha256:ghi789jkl012",
                                                     },
                                                     {"name": "REGULAR_ENV_VAR", "value": "not-an-image"},
                                                 ],
@@ -61,7 +61,7 @@ def get_test_csv():
             },
             "relatedImages": [
                 {"name": "database-image", "image": "quay.io/mongodb/mongodb-enterprise-server@sha256:def456ghi789"},
-                {"name": "agent-image", "image": "quay.io/mongodb/mongodb-agent-ubi@sha256:ghi789jkl012"},
+                {"name": "agent-image", "image": "quay.io/mongodb/mongodb-agent@sha256:ghi789jkl012"},
                 {"name": "ops-manager-image", "image": "quay.io/mongodb/ops-manager@sha256:jkl012mno345"},
             ],
         },
@@ -73,7 +73,7 @@ def test_parse_image_url():
     """Test URL parsing for digest-pinned images."""
     test_cases = [
         ("quay.io/mongodb/operator@sha256:abc123", ("quay.io", "mongodb/operator", "sha256:abc123")),
-        ("quay.io/mongodb/mongodb-agent-ubi@sha256:def456", ("quay.io", "mongodb/mongodb-agent-ubi", "sha256:def456")),
+        ("quay.io/mongodb/mongodb-agent@sha256:def456", ("quay.io", "mongodb/mongodb-agent", "sha256:def456")),
         ("docker.io/library/nginx@sha256:123456", ("docker.io", "library/nginx", "sha256:123456")),
     ]
 
@@ -103,8 +103,8 @@ def test_backup_tag_generation():
     """Test backup tag generation."""
     test_cases = [
         ("quay.io/mongodb/operator@sha256:abc123", "1.31.0", "1.0.0"),
-        ("quay.io/mongodb/mongodb-agent-ubi@sha256:def456", "107.0.12.8669-1", "1.2.0"),
-        ("quay.io/mongodb/mongodb-agent-ubi@sha256:ghi789", "12.0.33.7866_1.1.1.0", "1.2.0"),
+        ("quay.io/mongodb/mongodb-agent@sha256:def456", "107.0.12.8669-1", "1.2.0"),
+        ("quay.io/mongodb/mongodb-agent@sha256:ghi789", "12.0.33.7866_1.1.1.0", "1.2.0"),
         ("quay.io/mongodb/mongodb-enterprise-server@sha256:jkl012", "4.4.15-ubi8", "1.0.0"),
     ]
 
@@ -143,7 +143,7 @@ def test_csv_parsing():
         # Should find 3 unique images from relatedImages section
         expected_image_urls = {
             "quay.io/mongodb/mongodb-enterprise-server@sha256:def456ghi789",
-            "quay.io/mongodb/mongodb-agent-ubi@sha256:ghi789jkl012",
+            "quay.io/mongodb/mongodb-agent@sha256:ghi789jkl012",
             "quay.io/mongodb/ops-manager@sha256:jkl012mno345",
         }
         assert (
@@ -158,7 +158,7 @@ def test_csv_parsing():
         # Format: quay.io/mongodb/{repo_name}:{original_tag}_openshift_{version}
         expected_tags = {
             "quay.io/mongodb/mongodb-enterprise-server@sha256:def456ghi789": ("mongodb-enterprise-server", "1.0.0"),
-            "quay.io/mongodb/mongodb-agent-ubi@sha256:ghi789jkl012": ("mongodb-agent-ubi", "1.0.0"),
+            "quay.io/mongodb/mongodb-agent@sha256:ghi789jkl012": ("mongodb-agent", "1.0.0"),
             "quay.io/mongodb/ops-manager@sha256:jkl012mno345": ("ops-manager", "1.0.0"),
         }
 
diff --git a/scripts/evergreen/periodic-cleanup-aws.py b/scripts/evergreen/periodic-cleanup-aws.py
index 3f8ca0799..cdeec9603 100755
--- a/scripts/evergreen/periodic-cleanup-aws.py
+++ b/scripts/evergreen/periodic-cleanup-aws.py
@@ -7,6 +7,7 @@
 
 REPOSITORIES_NAMES = [
     "dev/mongodb-agent-ubi",
+    "dev/mongodb-agent",
     "dev/mongodb-kubernetes-init-appdb",
     "dev/mongodb-kubernetes-database",
     "dev/mongodb-kubernetes-init-database",
diff --git a/scripts/funcs/operator_deployment b/scripts/funcs/operator_deployment
index 36c1f4764..f13b31f23 100644
--- a/scripts/funcs/operator_deployment
+++ b/scripts/funcs/operator_deployment
@@ -34,6 +34,7 @@ get_operator_helm_values() {
     "operator.telemetry.send.enabled=${MDB_OPERATOR_TELEMETRY_SEND_ENABLED:-false}"
     # lets collect and save in the configmap as frequently as we can
     "operator.telemetry.collection.frequency=${MDB_OPERATOR_TELEMETRY_COLLECTION_FREQUENCY:-1m}"
+    "community.registry.agent=${AGENT_BASE_REGISTRY:-${REGISTRY}}"
   )
 
   if [[ "${MDB_OPERATOR_TELEMETRY_INSTALL_CLUSTER_ROLE_INSTALLATION:-}" != "" ]]; then
diff --git a/scripts/release/tests/build_info_test.py b/scripts/release/tests/build_info_test.py
index 54d8d3141..e3c341da7 100644
--- a/scripts/release/tests/build_info_test.py
+++ b/scripts/release/tests/build_info_test.py
@@ -90,7 +90,7 @@ def test_load_build_info_development(git_repo: Repo):
                 sign=False,
             ),
             "agent": ImageInfo(
-                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
+                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"],
                 platforms=["linux/amd64"],
                 version=version,
                 dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",
@@ -205,7 +205,7 @@ def test_load_build_info_patch(git_repo: Repo):
                 sign=False,
             ),
             "agent": ImageInfo(
-                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent-ubi"],
+                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-agent"],
                 platforms=["linux/amd64"],
                 version=patch_id,
                 dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",
@@ -323,7 +323,7 @@ def test_load_build_info_staging(git_repo: Repo):
                 sign=True,
             ),
             "agent": ImageInfo(
-                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent-ubi"],
+                repositories=["268558157000.dkr.ecr.us-east-1.amazonaws.com/staging/mongodb-agent"],
                 platforms=["linux/arm64", "linux/amd64", "linux/s390x", "linux/ppc64le"],
                 version=expected_commit_sha,
                 dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",