diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 922577c61f796efc5d23c97e630b2c3524b13f5d..db7be39e6d85fc2dddb627d1553006991d836e51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,8 +37,6 @@ lint-vhdl-lib-base:
     stage: linting
     allow_failure: true
     before_script:
-        #- DEBIAN_FRONTEND=noninteractive apt-get update
-        #- DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-pip python3-ipython
         - pip3 install vsg --use-pep517
     script:
         - cd libraries/base
@@ -76,7 +74,50 @@ lint-vhdl-lib-technology:
     script:
         - cd libraries/technology
         - find . -name "*.vhd" -exec vsg --configuration ../../vsg_config.yaml -f {} \;
-      
+
+lint-vhdl-boards-uniboard2b:
+    tags:
+        - hdl
+    stage: linting
+    allow_failure: true
+    before_script:
+        - pip3 install vsg --use-pep517
+    script:
+        - cd boards/uniboard2b
+        - find . -name "*.vhd" -exec vsg --configuration ../../vsg_config.yaml -f {} \;
+
+lint-vhdl-boards-uniboard2c:
+    tags:
+        - hdl
+    stage: linting
+    allow_failure: true
+    before_script:
+        - pip3 install vsg --use-pep517
+    script:
+        - cd boards/uniboard2c
+        - find . -name "*.vhd" -exec vsg --configuration ../../vsg_config.yaml -f {} \;
+
+lint-vhdl-applications-disturb2:
+    tags:
+        - hdl
+    stage: linting
+    allow_failure: true
+    before_script:
+        - pip3 install vsg --use-pep517
+    script:
+        - cd applications/disturb2
+        - find . -name "*.vhd" -exec vsg --configuration ../../vsg_config.yaml -f {} \;
+
+lint-vhdl-applications-lofar2:
+    tags:
+        - hdl
+    stage: linting
+    allow_failure: true
+    before_script:
+        - pip3 install vsg --use-pep517
+    script:
+        - cd applications/lofar2
+        - find . -name "*.vhd" -exec vsg --configuration ../../vsg_config.yaml -f {} \;
 
 ###############################################################################
 # HDL simulation stage