diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d757710955cd773b3b7e88bdb25dbd0d0a93ac9..45dbeb35372657e2c566bf2d31b9d115bd7f720b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ stages:
 .versions:
   parallel:
     matrix:
-      - OPENTOFU_VERSION: '1.6'
+      - OPENTOFU_VERSION: '1.6.0'
       - OPENTOFU_VERSION: '1.6.0-rc1'
 
 variables:
diff --git a/Dockerfile b/Dockerfile
index 114ec783f62c6d998674f2888ac7f4607aa4a02a..3a1e145f41fabe394cd3c63b65cdf7bacf258311 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,6 @@ ARG BASE_IMAGE
 
 FROM $BASE_IMAGE
 
-ARG OPENTOFU_VERSION
-
 RUN apk add --no-cache \
   curl \
   gcompat \
@@ -16,9 +14,10 @@ RUN apk add --no-cache \
 # Install OpenTofu using the installer script in standalone mode
 # see https://opentofu.org/docs/intro/install/standalone
 # We may want to switch to installing manually from GitHub and verifying signature
+ARG OPENTOFU_VERSION
 RUN curl --proto '=https' --tlsv1.2 -fsSL https://get.opentofu.org/install-opentofu.sh -o install-opentofu.sh && \
     chmod +x install-opentofu.sh && \
-    OPENTOFU_VERSION=${OPENTOFU_VERSION} ./install-opentofu.sh --install-method standalone && \
+    ./install-opentofu.sh --install-method standalone --opentofu-version "${OPENTOFU_VERSION}" && \
     rm ./install-opentofu.sh && \
     tofu --version