diff --git a/compass/utils/celeryconfig_wrapper.py b/compass/utils/celeryconfig_wrapper.py
index 721095ca..b6644ba5 100644
--- a/compass/utils/celeryconfig_wrapper.py
+++ b/compass/utils/celeryconfig_wrapper.py
@@ -23,9 +23,9 @@ import urllib
 from compass.utils import setting_wrapper as setting
 
 
-CELERY_RESULT_BACKEND = 'amqp://'
+# CELERY_RESULT_BACKEND = 'amqp://'
 
-BROKER_URL = 'amqp://guest:guest@localhost:5672//'
+# BROKER_URL = 'amqp://guest:guest@localhost:5672//'
 
 
 CELERY_IMPORTS = ('compass.tasks.tasks',)
diff --git a/conf/celeryconfig b/conf/celeryconfig
index 797e7618..cda7ce17 100644
--- a/conf/celeryconfig
+++ b/conf/celeryconfig
@@ -1,8 +1,12 @@
-## Celery related setting: this is the default setting once we install RabbitMQ
+## Celery related setting: this is the default setting
+import urllib
 
-CELERY_RESULT_BACKEND ="amqp://"
+#CELERY_RESULT_BACKEND ="amqp://"
+#BROKER_URL = "amqp://guest:guest@www.stack360.io:5672//"
 
-BROKER_URL = "amqp://guest:guest@www.stack360.io:5672//"
+BROKER_TRANSPORT = 'sqs'
+BROKER_URL = 'sqs://%s:%s@' % (urllib.quote(ACCESS_ID, safe=''),
+                               urllib.quote(ACCESS_KEY, safe=''))
 
 CELERY_IMPORTS=("compass.tasks.tasks",)
 CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
diff --git a/install/register.sh b/install/register.sh
index 4db968c3..089d6b36 100755
--- a/install/register.sh
+++ b/install/register.sh
@@ -2,13 +2,18 @@
 #
 #set -x
 ### Register current user to compass
-
+USER_EMAIL="aaa@huawei.com"
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source $DIR/install.conf
 echo "The email address you use to register is ${USER_EMAIL}"
 password=`< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c6`
 data=`echo "{\"email\":\"${USER_EMAIL}\",\"password\":\"${password}\"}"`
 wget -O /tmp/user_info --post-data=$data --header=Content-Type:application/json "http://www.stack360.io/api/users/register"
+wget -O /tmp/aws_credentials "http://www.stack360.io/aws_credentials"
+filename='/tmp/aws_credentials'
+id=$(sed -n '1p' < $filename)
+key=$(sed -n '2p' < $filename)
+sudo sed -i "s~ACCESS_ID~$id~g" /etc/compass/celeryconfig
+sudo sed -i "s~ACCESS_KEY~$key~g" /etc/compass/celeryconfig
 
 if [ $? -ne 0 ]; then
 echo "Register failed"
@@ -16,8 +21,6 @@ exit 1
 fi
 
 echo "Register suceeded, your password is $password, please remember your password at all times."
-sed -i 's/^CELERY_DEFAULT_QUEUE.*/CELERY_DEFAULT_QUEUE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
-sed -i 's/^CELERY_DEFAULT_EXCHANGE.*/CELERY_DEFAULT_EXCHANGE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
-sed -i 's/^CELERY_DEFAULT_ROUTING_KEY.*/CELERY_DEFAULT_ROUTING_KEY = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
-
-systemctl restart compass-celeryd.service
+sudo sed -i 's/^CELERY_DEFAULT_QUEUE.*/CELERY_DEFAULT_QUEUE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
+sudo sed -i 's/^CELERY_DEFAULT_EXCHANGE.*/CELERY_DEFAULT_EXCHANGE = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig
+sudo sed -i 's/^CELERY_DEFAULT_ROUTING_KEY.*/CELERY_DEFAULT_ROUTING_KEY = \"'"${USER_EMAIL}"'\"/g' /etc/compass/celeryconfig