diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a647a551bd71f263af9e309907a9e78ea13d9a1..1bb2c226fbd33d8cbff579f37e631bba5245de06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,16 @@ before_script:
   - apt-get install libx11-dev:i386 libc6-dev-i386 build-essential  -y
   - apt-get install libx11-dev libc6-dev build-essential  -y
 
-smoke-test-by-make:
+make-32bit:
   stage: build
   script:
-    - make
+    - ARCH_OPT='-m32' make
+  tags:
+    - docker
+
+make-64bit:
+  stage: build
+  script:
+    - ARCH_OPT='-m64' make
   tags:
     - docker
diff --git a/Makefile b/Makefile
index 0962f1e39f4dea46a1db53c739112f33281a1595..334a912b17d748f88add51a121f058f268fe14a1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,6 @@
 # along with this program; see the file COPYING.  If not, write to
 # the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-## Define this option to specify architecture
-## Can be -m32 for 32 bit application or
-## -m64 for 64 bit application.
-ARCH_OPT =
-
 CD = cd
 
 LOGINC = include