diff --git a/pkg/tcl/testworkflowstcl/testworkflowprocessor/operations.go b/pkg/tcl/testworkflowstcl/testworkflowprocessor/operations.go
index 84d35a0e2eb..07ea6efeecb 100644
--- a/pkg/tcl/testworkflowstcl/testworkflowprocessor/operations.go
+++ b/pkg/tcl/testworkflowstcl/testworkflowprocessor/operations.go
@@ -46,7 +46,7 @@ func ProcessExecute(_ testworkflowprocessor.InternalProcessor, layer testworkflo
 
 	container.
 		SetImage(constants.DefaultToolkitImage).
-		SetImagePullPolicy(corev1.PullIfNotPresent).
+		SetImagePullPolicy(corev1.PullNever).
 		SetCommand(constants.DefaultToolkitPath, "execute").
 		EnableToolkit(stage.Ref()).
 		AppendVolumeMounts(layer.AddEmptyDirVolume(nil, constants.DefaultTransferDirPath))
@@ -104,7 +104,7 @@ func ProcessParallel(_ testworkflowprocessor.InternalProcessor, layer testworkfl
 
 	stage.Container().
 		SetImage(constants.DefaultToolkitImage).
-		SetImagePullPolicy(corev1.PullIfNotPresent).
+		SetImagePullPolicy(corev1.PullNever).
 		SetCommand(constants.DefaultToolkitPath, "parallel").
 		EnableToolkit(stage.Ref()).
 		AppendVolumeMounts(layer.AddEmptyDirVolume(nil, constants.DefaultTransferDirPath))
diff --git a/pkg/testworkflows/testworkflowprocessor/constants/constants.go b/pkg/testworkflows/testworkflowprocessor/constants/constants.go
index dd0f95dd31a..64fdeb9b148 100644
--- a/pkg/testworkflows/testworkflowprocessor/constants/constants.go
+++ b/pkg/testworkflows/testworkflowprocessor/constants/constants.go
@@ -64,6 +64,7 @@ func getInitImage() string {
 
 func getToolkitImage() string {
 	img := os.Getenv("TESTKUBE_TW_TOOLKIT_IMAGE")
+	img = "testworkflow-toolkit"
 	if img == "" {
 		ver := version.Version
 		if ver == "" || ver == "dev" {
diff --git a/pkg/testworkflows/testworkflowprocessor/operations.go b/pkg/testworkflows/testworkflowprocessor/operations.go
index 3c1769dd406..2de1746151c 100644
--- a/pkg/testworkflows/testworkflowprocessor/operations.go
+++ b/pkg/testworkflows/testworkflowprocessor/operations.go
@@ -183,7 +183,7 @@ func ProcessContentGit(_ InternalProcessor, layer Intermediate, container stage.
 	selfContainer.
 		SetWorkingDir("/").
 		SetImage(constants.DefaultToolkitImage).
-		SetImagePullPolicy(corev1.PullIfNotPresent).
+		SetImagePullPolicy(corev1.PullNever).
 		SetCommand("/toolkit", "clone", step.Content.Git.Uri).
 		EnableToolkit(stage.Ref())
 
@@ -298,7 +298,7 @@ func ProcessArtifacts(_ InternalProcessor, layer Intermediate, container stage.C
 
 	selfContainer.
 		SetImage(constants.DefaultToolkitImage).
-		SetImagePullPolicy(corev1.PullIfNotPresent).
+		SetImagePullPolicy(corev1.PullNever).
 		SetCommand(constants.DefaultToolkitPath, "artifacts", "-m", constants.DefaultDataPath).
 		EnableToolkit(stage.Ref())
 
diff --git a/pkg/testworkflows/testworkflowprocessor/presets/presets.go b/pkg/testworkflows/testworkflowprocessor/presets/presets.go
index ee295f0f103..ee5e2c91cd5 100644
--- a/pkg/testworkflows/testworkflowprocessor/presets/presets.go
+++ b/pkg/testworkflows/testworkflowprocessor/presets/presets.go
@@ -16,8 +16,8 @@ func NewOpenSource(inspector imageinspector.Inspector) testworkflowprocessor.Pro
 		Register(testworkflowprocessor.ProcessNestedSetupSteps).
 		Register(testworkflowprocessor.ProcessRunCommand).
 		Register(testworkflowprocessor.ProcessShellCommand).
-		Register(testworkflowprocessor.StubExecute).
-		Register(testworkflowprocessor.StubParallel).
+		Register(testworkflowprocessortcl.ProcessExecute).
+		Register(testworkflowprocessortcl.ProcessParallel).
 		Register(testworkflowprocessor.ProcessNestedSteps).
 		Register(testworkflowprocessor.ProcessArtifacts)
 }