diff --git a/pkg/runner/expression.go b/pkg/runner/expression.go
index f12c6ef..c0ce3a0 100644
--- a/pkg/runner/expression.go
+++ b/pkg/runner/expression.go
@@ -296,6 +296,14 @@ func (sc *StepContext) vmEnv() func(*otto.Otto) {
 
 func (sc *StepContext) vmInputs() func(*otto.Otto) {
 	inputs := make(map[string]string)
+
+	// Set Defaults
+	if sc.Action != nil {
+		for k, input := range sc.Action.Inputs {
+			inputs[k] = input.Default
+		}
+	}
+
 	for k, v := range sc.Step.With {
 		inputs[k] = v
 	}
diff --git a/pkg/runner/testdata/remote-action-docker/push.yml b/pkg/runner/testdata/remote-action-docker/push.yml
index 75a42b5..e5075bf 100644
--- a/pkg/runner/testdata/remote-action-docker/push.yml
+++ b/pkg/runner/testdata/remote-action-docker/push.yml
@@ -5,6 +5,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/hello-world-docker-action@master
+    - uses: actions/hello-world-docker-action@main
       with:
         who-to-greet: 'Mona the Octocat'