diff --git a/.deploy.sh b/.deploy.sh
index 934540cd8f61ce086fbc1d58ee687f6f430a3946..492c880054991facb60e2c668f6a3be34251e5a8 100755
--- a/.deploy.sh
+++ b/.deploy.sh
@@ -13,20 +13,21 @@ echo "Deploy job name: $CI_JOB_NAME"
 
 if [ "$CI_JOB_NAME" = "deploy_for_unstable" ]; then
     dput -u -f --config=dput.cf repo build/*.changes
-elif [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
-    CHANGELOG="package/debian/changelog"
-    LINE=$(head -n 1 $CHANGELOG)
-    PACKAGE=$(echo "$LINE" | cut -d' ' -f1)
-    VERSION=$(echo "$LINE" | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
 
-    REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc testing unstable $PACKAGE $VERSION"
-    ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
-elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
+else
+    if [ "$CI_JOB_NAME" = "deploy_for_testing" ]; then
+       REPO_SRC="unstable"
+       REPO_TGT="testing"
+    elif [ "$CI_JOB_NAME" = "deploy_for_stable" ]; then
+       REPO_SRC="testing"
+       REPO_TGT="stable"
+    fi
+
     CHANGELOG="package/debian/changelog"
     LINE=$(head -n 1 $CHANGELOG)
     PACKAGE=$(echo "$LINE" | cut -d' ' -f1)
     VERSION=$(echo "$LINE" | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
+    REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc $REPO_TGT $REPO_SRC $PACKAGE $VERSION"
 
-    REPREPRO_CMD="reprepro -Vb /home/repository/www/le6 copysrc stable testing $PACKAGE $VERSION"
-    ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
+    ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null repository@repo.c3sl.ufpr.br "$REPREPRO_CMD"
 fi
diff --git a/package/debian/changelog b/package/debian/changelog
index 1b580cfea579da47964b7aed9e5a36bb0b8f6c28..fca154381e8509fc1528297a0d46d6ebdb889d14 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+le-edubar (0.1.8) unstable; urgency=medium
+
+  * Refactor the CI deploy code (Closes: #580)
+
+ -- Guilherme Becker Agge <lesuporte@c3sl.ufpr.br>  Thu, 05 Jul 2018 11:55:53 -0300
+
 le-edubar (0.1.8) testing; urgency=medium
 
   * Fix query string