diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a44ce8cc..49432d35 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -23,10 +23,6 @@ jobs:
           # Install Maven
           brew install maven
 
-          # Install `envsubst`
-          brew install gettext
-          brew link --force gettext
-
           # Install cabextract
           brew install cabextract
 
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 9d12e99a..3839103d 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -25,11 +25,11 @@ jobs:
 
           # If necessary
           echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
-#          sudo apt-get install ttf-mscorefonts-installer
+          sudo apt-get install ttf-mscorefonts-installer
 
-#      - name: Setup Cambria fonts
-#        run: |
-#          curl -Ls https://raw.githubusercontent.com/metanorma/vista-fonts-installer/master/vista-fonts-installer.sh | sudo bash
+      - name: Setup Cambria fonts
+        run: |
+          curl -Ls https://raw.githubusercontent.com/metanorma/vista-fonts-installer/master/vista-fonts-installer.sh | sudo bash
 
       - name: Build
         env:
diff --git a/Makefile b/Makefile
index e03a7a4e..734d2df8 100644
--- a/Makefile
+++ b/Makefile
@@ -13,15 +13,6 @@ target/$(JAR_FILE):
 test: target/$(JAR_FILE)
 	mvn --settings settings.xml test surefire-report:report
 
-# settings.xml: settings.xml.in
-#settings:
-#	GITHUB_USERNAME=${GITHUB_USERNAME}
-#	GITHUB_TOKEN=${GITHUB_TOKEN}
-#	envsubst < settings.xml > ~/.m2/settings.xml
-#	cp settings.xml ~/.m2/settings.xml
-#	cat ~/.m2/settings.xml
-	
-
 clean:
 	mvn clean