diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bde44b..9e91d5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ stages:
   - build
 
 build:
-  image: ubuntu
+  image: debian:stable-slim
   stage: build
   before_script:
-    - apt update && apt install -y make wget sudo git emacs
-    - git clone https://gitlab.com/FG42/FG42 ~/.fg42/ && cd ~/.fg42/ && make install && touch empty.el
+    - apt update && apt install -y make wget git emacs
+    - git clone https://gitlab.com/FG42/FG42 ~/.fg42/ && cd ~/.fg42/ && make install-ci && touch empty.el
   script:
     - fg42 -nw --script empty.el
diff --git a/Makefile b/Makefile
index 667102f..e538a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,22 @@
+.PHONY: update
 update:
 	@git remote set-url origin git://gitlab.com/FG42/FG42.git
 	@git pull origin master
+
+.PHONY: install-cli
+install-ci:
+	@echo "Downloading and installing fonts..."
+	@mkdir -p ~/.fonts
+	@wget "https://github.com/FG42/fonts/archive/0.1.0.tar.gz" -O ~/.fonts/fg42.tar.gz
+	@tar zxf ~/.fonts/fg42.tar.gz -C ~/.fonts --strip 1
+	@cp ./config/fg42.user.el ${HOME}/.fg42.el
+	@echo "Creating the link..."
+	@echo "#! /bin/sh" > ./fg42
+	@echo "export FG42_HOME=$(shell pwd)" >> ./fg42
+	@echo 'emacs --name FG42 --no-site-file --no-site-lisp --no-splash --title FG42 -l $$FG42_HOME/fg42-config.el "$$@"' >> ./fg42
+	@chmod +x ./fg42
+
+.PHONY: install
 install:
 	@echo "Downloading and installing fonts..."
 	@mkdir -p ~/.fonts
@@ -21,11 +37,8 @@ install:
 	@echo "------------------------------------------------------------------------------------"
 	@echo "Make sure to install external dependencies of FG42. For more info checkout README.md"
 	@echo "Enjoy the bless of GNU/Emacs and FG42 :)"
+
+.PHONY: install-fonts
 install-fonts:
 	@mkdir -p ~/.fonts/
 	@cp -rv ./share/fonts/vazir/* ~/.fonts/
-build-image:
-	docker build . -t fg42:1 --build-arg emacs_version=26.3
-
-clean-image:
-	docker rmi fg42:1