diff --git a/Dockerfile b/Dockerfile
index 3d14228bf85e7a8b6b34596913cceb637d6f4cd3..d159db069f072efe17c5300fc91de83798c0bb7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG BASE_REGISTRY=registry1.dsop.io
+ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_TAG=8.4
 
 FROM openpolicyagent/opa:0.28.0 as base
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 1ae643149e3e821c8958f95b6ce5ec5a3d879669..1c8cfcf4b80d477475f4a6d0c8e093db4cb3ae83 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 # Docker image labels
 labels:
diff --git a/renovate.json b/renovate.json
index e58980f0fffc72510c76bd7361a9269f7a626e59..47c3a7a33008e5ec39324b641eb49555485018cd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,17 +5,9 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "openpolicyagent/opa",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -37,4 +29,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
\ No newline at end of file
+}