diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81ff6e9db533cd4e42757db93d167922503501b7..35105b060bd7966f4b09a40b4caff7423e25a9b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,47 +1,18 @@
 stages:
   - build
   - test
-  - release
 
-variables:
-  CONTAINER_TEST_IMAGE: boileaum/rosen:$CI_COMMIT_REF_NAME
-  CONTAINER_RELEASE_IMAGE: boileaum/rosen:latest
-
-before_script:
-  - echo $DOCKERHUB_PASSWD | docker login -u boileaum --password-stdin
-
-b:docker:
+build_hello:
   stage: build
   tags:
     - shell, docker
   script:
-    - docker build --pull -t $CONTAINER_TEST_IMAGE -f ./docker/Dockerfile-rosen .
-    - docker push $CONTAINER_TEST_IMAGE
+    - make
 
-t:helloworld:
+test_hello:
   stage: test
   tags:
     - shell, docker
   script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'python test_helloworld.py'
-
-t:rosen:
-  stage: test
-  tags:
-    - shell, docker
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'pytest -v'
-
-r:docker:
-  stage: release
-  tags:
-    - shell, docker
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
-  only:
-    - master
+    - make test
 
diff --git a/makefile b/makefile
index 046d6aefa9ed6a09588ed055b49cb28b7a9f2d25..4c8d33dff65ccec161cab9a5ce1d48dd72cb1807 100644
--- a/makefile
+++ b/makefile
@@ -1,9 +1,10 @@
-.PHONY: clean
-
 all: helloworld
 
 helloworld:
-	  gcc helloworld.c -o helloworld.e
+	  cc helloworld.c -o helloworld.e
+
+test: helloworld
+	  python test_helloworld.py
 
 clean:
 	  rm -rf *.o *.e *.so *.pyf *.pyc __pycache__