diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index a1962fe82..b9c655ffa 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -49,7 +49,7 @@ jobs:
           sudo apt-get -qq install python3-dev texinfo unzip
 
       - name: Install erlang/OTP
-        uses: erlef/setup-beam@v1
+        uses: erlef/setup-beam@v1.17.2
         with:
           otp-version: ${{ env.OTP_VSN }}
           elixir-version: ${{ env.ELIXIR_VSN }}
diff --git a/tools/make-binaries b/tools/make-binaries
index 51d2261e7..30165290c 100755
--- a/tools/make-binaries
+++ b/tools/make-binaries
@@ -350,8 +350,8 @@ add_otp_path()
 	then
 		# For github runners to build for non-native systems:
 		# https://github.com/erlef/setup-beam#environment-variables
-		native_otp_bin="$INSTALL_DIR_FOR_OTP/bin"
-		native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR/bin"
+		native_otp_bin="$INSTALL_DIR_FOR_OTP"
+		native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR"
 		export PATH="$native_elixir_bin:$PATH"
 	fi
 	export PATH="$native_otp_bin:$PATH"