diff --git a/Dockerfile b/Dockerfile
index 1890d279505824dda6cb5403625f01c4c6d80bc0..70ded08a08de020a8b6201bccffe85a232cca306 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=ironbank/opensource/r/r-studio
+ARG BASE_TAG=latest
+
 FROM registry1.dso.mil/ironbank/aiml/python/python-r-ai as base
-FROM registry1.dso.mil/ironbank/opensource/r/r-studio as final
+
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 COPY --from=base /usr/local/bin/ /usr/local/bin/
 COPY --from=base /usr/local/lib/ /usr/local/lib/
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 8aef53167106f8934a6bd65dc95079d539c3bb2f..34553d80969424291d03f9bd503e852621a54d04 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -13,8 +13,8 @@ tags:
 
 # Build args passed to Dockerfile ARGs
 args:
-  BASE_IMAGE: "carnegie-mellon/python-ai/python38-ai"
-  BASE_TAG: "3.8"
+  BASE_IMAGE: "opensource/r/r-studio"
+  BASE_TAG: "1.4.1717"
 
 # Docker image labels
 labels: