diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c288b68..e962d5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,16 +44,13 @@ jobs:
 
       - run: git --version
 
-      # Skipping temporarily for ghc 9.6
-      #- run: cabal update
-      #- run: make install-dependencies
+      - run: make install-dependencies
 
-      # GHCFLAGS need to be set for ghc 9.6
-      - run: make GHCFLAGS="-package base -package template-haskell"
-      - run: make GHCFLAGS="-package base -package template-haskell" test
-      - run: make GHCFLAGS="-package base -package template-haskell" haddock
-      - run: make GHCFLAGS="-package base -package template-haskell" test-sdist
-      - run: make GHCFLAGS="-package base -package template-haskell" test-via-cabal
+      - run: make
+      - run: make test
+      - run: make haddock
+      - run: make test-sdist
+      - run: make test-via-cabal
 
 
   test-with-ghc:
@@ -104,7 +101,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
-      - run: cabal update
       - run: make install-dependencies
 
       - run: make
diff --git a/mk/haskell.mk b/mk/haskell.mk
index 68920ee..27e2966 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -90,7 +90,10 @@ depend:
 	find $(ALL_HSS) | ./mk/ghcdeps -i$(GHCIMPORTDIRS) $(GHCFLAGS) > $(DEPMK)
 
 install-dependencies:
-	$(CABAL_INSTALL) $(INSTALL_DEPS)
+	if [ -n "$(INSTALL_DEPS)" ]; then \
+		cabal update && \
+		$(CABAL_INSTALL) $(INSTALL_DEPS); \
+	fi
 
 # haddock rules
 haddock: doc/index.html