diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml
index 9922f8e20..57dedaf45 100644
--- a/.github/workflows/functional-tests.yml
+++ b/.github/workflows/functional-tests.yml
@@ -163,8 +163,16 @@ jobs:
       - name: Configure OpenShell gateway
         if: steps.changes.outputs.relevant != 'false'
         run: |
+          source .github/scripts/openshell-version.sh
           mkdir -p "$HOME/.config/openshell"
           echo "OPENSHELL_BIND_ADDRESS=0.0.0.0" > "$HOME/.config/openshell/gateway.env"
+          cat > "$HOME/.config/openshell/gateway.toml" << EOF
+          [openshell]
+          version = 1
+
+          [openshell.gateway]
+          supervisor_image = "ghcr.io/nvidia/openshell/supervisor:${OPENSHELL_VERSION}"
+          EOF
 
       - name: Install OpenShell CLI
         if: steps.changes.outputs.relevant != 'false'
diff --git a/action.yml b/action.yml
index 2c8df3fb7..121c8fad5 100644
--- a/action.yml
+++ b/action.yml
@@ -269,10 +269,18 @@ runs:
     - name: Configure OpenShell gateway
       shell: bash
       run: |
+        source "$GITHUB_ACTION_PATH/.github/scripts/openshell-version.sh"
         mkdir -p $HOME/.config/openshell/
         cat > $HOME/.config/openshell/gateway.env << EOF
         OPENSHELL_BIND_ADDRESS=0.0.0.0
         EOF
+        cat > $HOME/.config/openshell/gateway.toml << EOF
+        [openshell]
+        version = 1
+
+        [openshell.gateway]
+        supervisor_image = "ghcr.io/nvidia/openshell/supervisor:${OPENSHELL_VERSION}"
+        EOF
 
     - name: Install OpenShell CLI
       shell: bash