diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 02be1f147..6e941512d 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -213,7 +213,6 @@ deploy node for linux amd64:
     - echo $INSTANCE_ID
     - scp -i gitlab-featurebase-dev.pem featurebase_linux_amd64 ec2-user@$PUBLIC_IP:.
     - scp -i gitlab-featurebase-dev.pem .gitlab/featurebase.conf .gitlab/featurebase.service ec2-user@$PUBLIC_IP:.
-    - sleep 120
   needs:
     job: build for linux amd64
   artifacts:
@@ -222,7 +221,7 @@ deploy node for linux amd64:
 
 run featurebase in linux amd64 node:
   stage: lint
-  image:
+  image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest
   variables:
     INSTANCE_ID: ""
   before_script:
@@ -232,6 +231,7 @@ run featurebase in linux amd64 node:
     - INSTANCE_ID=$(cat linux-amd64-instance.txt)
   script:
     - aws ssm send-command --document-name "AWS-RunShellScript" --targets InstanceIds=$INSTANCE_ID --cli-input-json file://.gitlab/configureFeatureBase.json
+    - sleep 120
   needs:
     job:
       deploy node for linux amd64
diff --git a/.gitlab/cloud-init.sh b/.gitlab/cloud-init.sh
index f9f289582..e87c6124a 100755
--- a/.gitlab/cloud-init.sh
+++ b/.gitlab/cloud-init.sh
@@ -18,5 +18,5 @@ curl -O https://dl.google.com/go/go1.16.9.linux-amd64.tar.gz
 tar xvf go1.16.9.linux-amd64.tar.gz
 chown -R root:root ./go
 mv go /usr/local
-echo "export PATH=$PATH:/usr/local/go/bin" | sudo tee -a /etc/profile > /dev/null
+echo "export PATH=/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/ec2-user/.local/bin:/home/ec2-user/bin:/usr/local/go/bin" | tee -a /etc/profile > /dev/null
 source /etc/profile