diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c55bf..2247601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,9 @@
-image: ubuntu:latest
+image: koalaman/shellcheck:latest
+
+stages:
+  - Lint
 
 before_script:
-  - apt-get update && apt-get install -y --no-install-recommends shellcheck
   - shopt -s expand_aliases
   - alias shellcheck="shellcheck -x --exclude=SC2034,SC1091,SC1090,SC2012"
 
diff --git a/system/.config/polybar/scripts/gmail/count.py b/system/.config/polybar/scripts/gmail/count.py
index 62a5ba3..fe00c21 100755
--- a/system/.config/polybar/scripts/gmail/count.py
+++ b/system/.config/polybar/scripts/gmail/count.py
@@ -12,8 +12,10 @@ from httplib2 import ServerNotFoundError
 DIR = os.path.dirname(os.path.realpath(__file__))
 CREDENTIALS_PATH = os.path.join(DIR, 'credentials.json')
 
-
-gmail = discovery.build(
-    'gmail', 'v1', credentials=file.Storage(CREDENTIALS_PATH).get())
-labels = gmail.users().labels().get(userId='me', id='INBOX').execute()
-print(labels['messagesUnread'])
+try:
+    gmail = discovery.build(
+        'gmail', 'v1', credentials=file.Storage(CREDENTIALS_PATH).get())
+    labels = gmail.users().labels().get(userId='me', id='INBOX').execute()
+    print(labels['messagesUnread'])
+except Exception as e:
+    print(0)
diff --git a/system/.config/polybar/scripts/update-count b/system/.config/polybar/scripts/update-count
index 35d5dde..3dbf79c 100755
--- a/system/.config/polybar/scripts/update-count
+++ b/system/.config/polybar/scripts/update-count
@@ -12,6 +12,6 @@
 # USAGE:
 # ./update-count
 UPDATES=$(pacman -Qu | wc -l)
-AUR_UPDATES=$(yay -Qua --devel | wc -l)
+AUR_UPDATES=$(yay -Qua --devel 2>&1 | wc -l)
 
 echo "${UPDATES} / ${AUR_UPDATES}"
\ No newline at end of file