diff --git a/.github/configs b/.github/configs
index 90401c9dd..339459bf0 100755
--- a/.github/configs
+++ b/.github/configs
@@ -56,7 +56,7 @@ case "$config" in
     tcmalloc)
 	CONFIGFLAGS="--with-ldflags=-ltcmalloc"
 	;;
-    kerberos5)
+    krb5|heimdal)
 	CONFIGFLAGS="--with-kerberos5"
 	;;
     libedit)
diff --git a/.github/setup_ci.sh b/.github/setup_ci.sh
index 4ffb3b99e..2d1943c37 100755
--- a/.github/setup_ci.sh
+++ b/.github/setup_ci.sh
@@ -41,9 +41,11 @@ for TARGET in $TARGETS; do
         compiler=$(echo $TARGET | sed 's/-Werror//')
         PACKAGES="$PACKAGES $compiler"
         ;;
-    kerberos5)
+    krb5)
+        PACKAGES="$PACKAGES libkrb5-dev"
+	;;
+    heimdal)
         PACKAGES="$PACKAGES heimdal-dev"
-        #PACKAGES="$PACKAGES libkrb5-dev"
         ;;
     sk)
         INSTALL_FIDO_PPA="yes"
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f3f897dcc..768fbc510 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -57,7 +57,8 @@ jobs:
           - { os: ubuntu-latest, configs: openssl-1.1.1_stable } # stable branch
           - { os: ubuntu-latest, configs: openssl-3.0 }          # stable branch
           - { os: ubuntu-18.04, configs: pam }
-          - { os: ubuntu-18.04, configs: kerberos5 }
+          - { os: ubuntu-18.04, configs: krb5 }
+          - { os: ubuntu-18.04, configs: heimdal }
           - { os: ubuntu-18.04, configs: libedit }
           - { os: ubuntu-18.04, configs: sk }
           - { os: ubuntu-18.04, configs: selinux }