diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d29e55..3657775 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,12 @@
-image: blang/latex
+image: blang/latex:ctanfull
+
+stages:
+  - build
 
 uhhassignment:
   stage: build
   script:
-    # Build the actual *.cls file
-    - pdflatex uhhassignment.ins
-    # Build the documentation files
-    - pdflatex uhhassignment.dtx
-    - makeindex -s gind.ist uhhassignment
-    - makeindex -s gglo.ist -o uhhassignment.gls uhhassignment.glo
-    - pdflatex uhhassignment.dtx
-    - pdflatex uhhassignment.dtx
+    - make all
   artifacts:
     paths:
       - "uhhassignment.cls"
diff --git a/Makefile b/Makefile
index aa71264..8fa237c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,25 @@ CLASS_NAME = uhhassignment
 INDEX_NAME = gind
 GLOSSARY_NAME = gglo
 
-dist: clean doc package cleantmp
+.PHONY: all clean cleandist
 
-doc:
+all: cleanall uhhassignment.cls uhhassignment.pdf clean
+
+test.pdf: uhhassignment.cls test.tex
+	latexmk -pdf test.tex
+
+uhhassignment.pdf: uhhassignment.ins uhhassignment.dtx
 	$(TEXENGINE) $(CLASS_NAME).dtx
 	$(MAKEINDEX) -s $(INDEX_NAME).ist $(CLASS_NAME)
 	$(MAKEINDEX) -s $(GLOSSARY_NAME).ist -o $(CLASS_NAME).gls $(CLASS_NAME).glo
 	$(TEXENGINE) $(CLASS_NAME).dtx
 	$(TEXENGINE) $(CLASS_NAME).dtx
 
-package:
+uhhassignment.cls: uhhassignment.ins uhhassignment.dtx
 	$(TEXENGINE) $(CLASS_NAME).ins
 
-clean cleantmp:
+cleanall: clean
 	rm -f *.pdf *.cls
 
-cleantmp:
-	rm -f *.log *.aux *.log *.glo *.gls *.hd *.idx *.ilg *.ind *.out *.toc
+clean:
+	rm -f *.log *.aux *.log *.glo *.gls *.hd *.idx *.ilg *.ind *.out *.toc *.fls *.fdb_latexmk