diff --git a/contrib/providers.d/azure/cloudconfig/install_runner.tpl b/contrib/providers.d/azure/cloudconfig/install_runner.tpl
index 14d88479..a13f78c3 100644
--- a/contrib/providers.d/azure/cloudconfig/install_runner.tpl
+++ b/contrib/providers.d/azure/cloudconfig/install_runner.tpl
@@ -59,7 +59,7 @@ sendStatus "starting service"
 ./svc.sh start || fail "failed to start service"
 
 set +e
-AGENT_ID=$(grep "agentId" /home/{{ .RunnerUsername }}/actions-runner/.runner |  tr -d -c 0-9)
+AGENT_ID=$(grep "agentId" /home/runner/actions-runner/.runner |  tr -d -c 0-9)
 if [ $? -ne 0 ];then
 	fail "failed to get agent ID"
 fi
diff --git a/contrib/providers.d/openstack/cloudconfig/install_runner.tpl b/contrib/providers.d/openstack/cloudconfig/install_runner.tpl
index 14d88479..a13f78c3 100644
--- a/contrib/providers.d/openstack/cloudconfig/install_runner.tpl
+++ b/contrib/providers.d/openstack/cloudconfig/install_runner.tpl
@@ -59,7 +59,7 @@ sendStatus "starting service"
 ./svc.sh start || fail "failed to start service"
 
 set +e
-AGENT_ID=$(grep "agentId" /home/{{ .RunnerUsername }}/actions-runner/.runner |  tr -d -c 0-9)
+AGENT_ID=$(grep "agentId" /home/runner/actions-runner/.runner |  tr -d -c 0-9)
 if [ $? -ne 0 ];then
 	fail "failed to get agent ID"
 fi
diff --git a/contrib/providers.d/openstack/garm-external-provider b/contrib/providers.d/openstack/garm-external-provider
index cc6eda64..da0876d1 100755
--- a/contrib/providers.d/openstack/garm-external-provider
+++ b/contrib/providers.d/openstack/garm-external-provider
@@ -275,7 +275,7 @@ function CreateInstance() {
     checkValNotNull "${VERSION}" "os_version" || return $?
     ARCH=$(echo "${IMAGE_DETAILS}" | jq -c -r '.properties.architecture')
     checkValNotNull "${ARCH}" "architecture" || return $?
-    GH_ARCH=OS_TO_GH_ARCH_MAP[${ARCH}]
+    GH_ARCH=${OS_TO_GH_ARCH_MAP[${ARCH}]}
 
     if [ -z "${GH_ARCH}" ];then
         GH_ARCH=${ARCH}