diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 51327e7dee8..729de8654bb 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -257,7 +257,7 @@ samba-def-build:
   needs:
     - job: samba-def-build
       artifacts: true
-    - job: samba-shellcheck
+    - job: samba-codecheck
 
 samba-mit-build:
   extends: .shared_template_build_only
@@ -272,7 +272,7 @@ samba-mit-build:
   needs:
     - job: samba-mit-build
       artifacts: true
-    - job: samba-shellcheck
+    - job: samba-codecheck
 
 samba-h5l-build:
   extends: .shared_template_build_only
@@ -388,7 +388,7 @@ samba-fips:
   variables:
     SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38}
 
-samba-shellcheck:
+samba-codecheck:
   extends: .shared_template
   needs:
   variables:
diff --git a/script/autobuild.py b/script/autobuild.py
index e074c39d3c0..e230c80761e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -1042,9 +1042,10 @@ tasks = {
         ],
     },
 
-    "samba-shellcheck": {
+    "samba-codecheck": {
         "sequence": [
             ("run", "script/check-shell-scripts.sh ."),
+            ("run", "script/codespell.sh ."),
         ],
     },