diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ebea18e992ad28d75a6f7eb3e3120730dbce6c6..c9cf3dc5c46a472aca666fd35e0b3c5c7732f523 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,20 @@ stages:
 #    - centos75
 #  variables:
 #    OS: 'centos75'  
+#
+#do-nightly-clean-arm32:
+#  <<: *do-nightly-clean
+#  tags:
+#    - arm32
+#  variables:
+#    OS: 'arm32'  
 
-do-nightly-clean-arm32:
+do-nightly-clean-arm64:
   <<: *do-nightly-clean
   tags:
-    - arm32
+    - arm64
   variables:
-    OS: 'arm32'  
+    OS: 'arm64'  
 
 
 #
@@ -83,13 +90,20 @@ do-nightly-clean-arm32:
 #    - centos75
 #  variables:
 #    OS: 'centos75'  
+#
+#do-build-arm32:
+#  <<: *do-build
+#  tags:
+#    - arm32
+#  variables:
+#    OS: 'arm32'  
 
-do-build-arm32:
+do-build-arm64:
   <<: *do-build
   tags:
-    - arm32
+    - arm64
   variables:
-    OS: 'arm32'  
+    OS: 'arm64'  
 
 
 #
diff --git a/build-all.sh b/build-all.sh
index c5b4063993547b60e14af107fc9890a72b23c2db..d93b8e5a903e30e882d37ba718e03dd4e980c2ee 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -7,7 +7,7 @@ if [[ "$*" =~ "--debug" ]]; then
 fi
 
 
-if [[ $(uname -m) == 'armv7l' ]]; then
+if [[ $(uname -m) == 'armv7l' ]] || [[ $(uname -m) == 'aarch64' ]]; then
 	scons $SCONSDEBUG 
 else 
 	scons $SCONSDEBUG -j 3