diff --git a/package-lock.json b/package-lock.json
index 294b83595..26516f345 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "gitlab-ci-local",
-  "version": "4.9.4",
+  "version": "4.9.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "4.9.4",
+      "version": "4.9.6",
       "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1",
diff --git a/package.json b/package.json
index 8617c6017..ddb4b0328 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "gitlab-ci-local",
   "main": "src/index.js",
   "bin": "src/index.js",
-  "version": "4.9.5",
+  "version": "4.9.6",
   "scripts": {
     "prepublishOnly": "npm run check-all && chmod +x src/index.js",
     "pkg-linux": "pkg src/index.js --public -t linux-x64 -o bin/linux/gitlab-ci-local && chmod +x bin/linux/gitlab-ci-local && gzip -c bin/linux/gitlab-ci-local > bin/linux.gz",
diff --git a/src/job-expanders.ts b/src/job-expanders.ts
index c9c7c7b18..565cb5611 100644
--- a/src/job-expanders.ts
+++ b/src/job-expanders.ts
@@ -59,7 +59,7 @@ export function beforeScripts(gitlabData: any) {
     forEachRealJob(gitlabData, (_, jobData) => {
         const expandedBeforeScripts = [].concat(jobData.before_script || (gitlabData.default || {}).before_script || gitlabData.before_script || []);
         if (expandedBeforeScripts.length > 0) {
-            jobData.beforeScripts = expandedBeforeScripts;
+            jobData.before_script = expandedBeforeScripts;
         }
     });
 }
@@ -68,7 +68,7 @@ export function afterScripts(gitlabData: any) {
     forEachRealJob(gitlabData, (_, jobData) => {
         const expandedAfterScripts = [].concat(jobData.after_script || (gitlabData.default || {}).after_script || gitlabData.after_script || []);
         if (expandedAfterScripts.length > 0) {
-            jobData.afterScripts = expandedAfterScripts;
+            jobData.after_script = expandedAfterScripts;
         }
     });
 }
diff --git a/src/tests/cases.test.ts b/src/tests/cases.test.ts
index 4b966b937..a9b26ba2f 100644
--- a/src/tests/cases.test.ts
+++ b/src/tests/cases.test.ts
@@ -123,6 +123,16 @@ test('before-script <test-job>', async () => {
     expect(mockProcessExit).toBeCalledTimes(0);
 });
 
+test('before-script-default <test-job>', async () => {
+    await defaultCmd.handler({
+        cwd: 'src/tests/test-cases/before-script-default',
+        job: 'test-job'
+    });
+    expect(mockProcessStdout).toHaveBeenCalledWith("Before test\n");
+    expect(mockProcessStderr).toBeCalledTimes(0);
+    expect(mockProcessExit).toBeCalledTimes(0);
+});
+
 test('after-script <test-job>', async () => {
     await defaultCmd.handler({
         cwd: 'src/tests/test-cases/after-script',
@@ -133,6 +143,16 @@ test('after-script <test-job>', async () => {
     expect(mockProcessExit).toBeCalledTimes(0);
 });
 
+test('after-script-default <test-job>', async () => {
+    await defaultCmd.handler({
+        cwd: 'src/tests/test-cases/after-script-default',
+        job: 'test-job'
+    });
+    expect(mockProcessStdout).toHaveBeenCalledWith("Cleanup after test\n");
+    expect(mockProcessStderr).toBeCalledTimes(0);
+    expect(mockProcessExit).toBeCalledTimes(0);
+});
+
 test('artifacts <test-root-file>', async () => {
     await defaultCmd.handler({
         cwd: 'src/tests/test-cases/artifacts',
diff --git a/src/tests/test-cases/after-script-default/.gitconfig b/src/tests/test-cases/after-script-default/.gitconfig
new file mode 100644
index 000000000..f1774a0cd
--- /dev/null
+++ b/src/tests/test-cases/after-script-default/.gitconfig
@@ -0,0 +1,2 @@
+[remote "origin"]
+	url = git@gitlab.com/gcl/test-case.git
diff --git a/src/tests/test-cases/after-script-default/.gitlab-ci.yml b/src/tests/test-cases/after-script-default/.gitlab-ci.yml
new file mode 100644
index 000000000..1617fee23
--- /dev/null
+++ b/src/tests/test-cases/after-script-default/.gitlab-ci.yml
@@ -0,0 +1,8 @@
+---
+default:
+  after_script:
+    - echo "Cleanup after test"
+
+test-job:
+  script:
+    - echo "Test something"
diff --git a/src/tests/test-cases/before-script-default/.gitconfig b/src/tests/test-cases/before-script-default/.gitconfig
new file mode 100644
index 000000000..f1774a0cd
--- /dev/null
+++ b/src/tests/test-cases/before-script-default/.gitconfig
@@ -0,0 +1,2 @@
+[remote "origin"]
+	url = git@gitlab.com/gcl/test-case.git
diff --git a/src/tests/test-cases/before-script-default/.gitlab-ci.yml b/src/tests/test-cases/before-script-default/.gitlab-ci.yml
new file mode 100644
index 000000000..4ab63831a
--- /dev/null
+++ b/src/tests/test-cases/before-script-default/.gitlab-ci.yml
@@ -0,0 +1,8 @@
+---
+default:
+  before_script:
+    - echo "Before test"
+
+test-job:
+  script:
+    - echo "Test something"