diff --git a/prepare_aws_enviroment.sh b/prepare_aws_enviroment.sh
index 8c400d3b8..3f12c468d 100644
--- a/prepare_aws_enviroment.sh
+++ b/prepare_aws_enviroment.sh
@@ -88,7 +88,10 @@ USER_DATA_SCRIPT=$(cat <<EOF
 #!/bin/bash
 sudo yum update -y
 sudo yum install -y docker
-sudo service docker start
+sudo systemctl enable docker
+sudo systemctl start docker
+sudo usermod -aG docker $USER
+newgrp docker
 EOF
 )