diff --git a/provider/provider.go b/provider/provider.go
index 270f6ce..160cc87 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -29,10 +29,8 @@ import (
 	"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/config"
 	"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/internal/spec"
 
-	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/ptr"
 
 	execution "github.com/cloudbase/garm-provider-common/execution/v0.1.0"
 	"github.com/cloudbase/garm-provider-common/params"
@@ -92,49 +90,42 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 
 	envs := spec.GetRunnerEnvs(gitHubScopeDetails, bootstrapParams)
 
-	jobv1 := batchv1.Job{
+	podv1 := corev1.Pod{
 		TypeMeta: metav1.TypeMeta{
-			Kind:       "Job",
-			APIVersion: "batch/v1",
+			Kind:       "Pod",
+			APIVersion: "v1",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   instancename,
 			Labels: map[string]string{"run": instancename},
 		},
-		Spec: batchv1.JobSpec{
-			BackoffLimit: ptr.To(int32(0)),
-			Completions:  ptr.To(int32(1)),
-			Template: corev1.PodTemplateSpec{
-				Spec: corev1.PodSpec{
-					RestartPolicy: "Never",
-					Containers: []corev1.Container{
-						corev1.Container{
-							Name:            "mganter-test",
-							Image:           "edp.buildth.ing/devfw-cicd/garm-act-runner:1",
-							ImagePullPolicy: "Always",
-							Env:             envs,
-							VolumeMounts: []corev1.VolumeMount{
-								corev1.VolumeMount{
-									MountPath: "/runner",
-									Name:      "cache-volume",
-								},
-							},
+		Spec: corev1.PodSpec{
+			Containers: []corev1.Container{
+				corev1.Container{
+					Name:            "mganter-test",
+					Image:           "edp.buildth.ing/devfw-cicd/garm-act-runner:1",
+					ImagePullPolicy: "Always",
+					Env:             envs,
+					VolumeMounts: []corev1.VolumeMount{
+						corev1.VolumeMount{
+							MountPath: "/runner",
+							Name:      "cache-volume",
 						},
 					},
-					Volumes: []corev1.Volume{
-						corev1.Volume{
-							Name: "cache-volume",
-							VolumeSource: corev1.VolumeSource{
-								EmptyDir: &corev1.EmptyDirVolumeSource{},
-							},
-						},
+				},
+			},
+			Volumes: []corev1.Volume{
+				corev1.Volume{
+					Name: "cache-volume",
+					VolumeSource: corev1.VolumeSource{
+						EmptyDir: &corev1.EmptyDirVolumeSource{},
 					},
 				},
 			},
 		},
 	}
 
-	manifest, err := json.Marshal(jobv1)
+	podjson, err := json.Marshal(podv1)
 	if err != nil {
 		return params.ProviderInstance{}, err
 	}
@@ -165,7 +156,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
 					Name: "EU.small",
 				},
 				DeploymentGenerator: "kubernetes-basic",
-				DeploymentManifest:  string(manifest),
+				DeploymentManifest:  string(podjson),
 				RequiredOutboundConnections: []edgeconnect.SecurityRule{
 					edgeconnect.SecurityRule{
 						PortRangeMax: 65535,
diff --git a/testpod.yaml b/testpod.yaml
index dfa9454..10ff110 100644
--- a/testpod.yaml
+++ b/testpod.yaml
@@ -1,101 +1,91 @@
 {
-    "apiVersion": "batch/v1",
-    "kind": "Job",
+    "apiVersion": "v1",
+    "kind": "Pod",
     "metadata": {
         "labels": {
-            "run": "garm-22264210-a1ddd91e-garm-k00npjkippjy"
+            "run": "garm-50cb196d-50fa68a5-garm-ff7ugu1ab8yo"
         },
-        "name": "garm-22264210-a1ddd91e-garm-k00npjkippjy"
+        "name": "garm-50cb196d-50fa68a5-garm-ff7ugu1ab8yo"
     },
     "spec": {
-        "backoffLimit": 0,
-        "completions": 1,
-        "template": {
-            "metadata": {
-            },
-            "spec": {
-                "containers": [
+        "containers": [
+            {
+                "env": [
                     {
-                        "env": [
-                            {
-                                "name": "RUNNER_GITEA_INSTANCE",
-                                "value": "https://gitea.com/api/v1"
-                            },
-                            {
-                                "name": "RUNNER_GROUP"
-                            },
-                            {
-                                "name": "RUNNER_NAME",
-                                "value": "garm-k00NpjkippjY"
-                            },
-                            {
-                                "name": "RUNNER_LABELS",
-                                "value": "garm,runner-controller-id=22264210-6ab5-4279-855e-218cd5f4bbc5,runner-pool-id=a1ddd91e-f533-49b7-afe3-57880ca809c1"
-                            },
-                            {
-                                "name": "RUNNER_NO_DEFAULT_LABELS",
-                                "value": "true"
-                            },
-                            {
-                                "name": "DISABLE_RUNNER_UPDATE",
-                                "value": "true"
-                            },
-                            {
-                                "name": "RUNNER_WORKDIR",
-                                "value": "/runner/_work/"
-                            },
-                            {
-                                "name": "GITHUB_URL",
-                                "value": "https://gitea.com"
-                            },
-                            {
-                                "name": "RUNNER_EPHEMERAL",
-                                "value": "true"
-                            },
-                            {
-                                "name": "RUNNER_TOKEN",
-                                "value": "dummy"
-                            },
-                            {
-                                "name": "METADATA_URL",
-                                "value": "https://garm.garm-provider-test.t09.de/api/v1/metadata"
-                            },
-                            {
-                                "name": "BEARER_TOKEN",
-                                "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjlhMTAxMThiLWU0NzctNGFhYy1iNzljLWFkYmQ1NmQ2ODI5MyIsIm5hbWUiOiJnYXJtLWswME5wamtpcHBqWSIsInByb3ZpZGVyX2lkIjoiYTFkZGQ5MWUtZjUzMy00OWI3LWFmZTMtNTc4ODBjYTgwOWMxIiwic2NvcGUiOiJyZXBvc2l0b3J5IiwiZW50aXR5IjoiQ2hyaXN0b3BoZXIuSGFzZS9nYXJtLXRlc3QiLCJjcmVhdGVfYXR0ZW1wdCI6MCwiZm9yZ2VfdHlwZSI6ImdpdGVhIiwiaXNzIjoiZ2FybSIsImV4cCI6MTc1NzUxMTk3N30.1c6kxdCh5sfxL6ZyzTIC3BYK-0u4h9jllXsZy_j23DM"
-                            },
-                            {
-                                "name": "CALLBACK_URL",
-                                "value": "https://garm.garm-provider-test.t09.de/api/v1/callbacks"
-                            },
-                            {
-                                "name": "JIT_CONFIG_ENABLED",
-                                "value": "false"
-                            }
-                        ],
-                        "image": "edp.buildth.ing/devfw-cicd/garm-act-runner:1",
-                        "imagePullPolicy": "Always",
-                        "name": "mganter-test",
-                        "resources": {
-                        },
-                        "volumeMounts": [
-                            {
-                                "mountPath": "/runner",
-                                "name": "cache-volume"
-                            }
-                        ]
+                        "name": "RUNNER_GITEA_INSTANCE",
+                        "value": "https://gitea.com"
+                    },
+                    {
+                        "name": "RUNNER_GROUP"
+                    },
+                    {
+                        "name": "RUNNER_NAME",
+                        "value": "garm-Ff7Ugu1AB8YO"
+                    },
+                    {
+                        "name": "RUNNER_LABELS",
+                        "value": "n,runner-controller-id=50cb196d-0d3d-4223-996f-11e5f10c30ba,runner-pool-id=50fa68a5-cadf-4d84-a78a-eafeb3bfd0b0"
+                    },
+                    {
+                        "name": "RUNNER_NO_DEFAULT_LABELS",
+                        "value": "true"
+                    },
+                    {
+                        "name": "DISABLE_RUNNER_UPDATE",
+                        "value": "true"
+                    },
+                    {
+                        "name": "RUNNER_WORKDIR",
+                        "value": "/runner/_work/"
+                    },
+                    {
+                        "name": "GITHUB_URL",
+                        "value": "https://gitea.com"
+                    },
+                    {
+                        "name": "RUNNER_EPHEMERAL",
+                        "value": "true"
+                    },
+                    {
+                        "name": "RUNNER_TOKEN",
+                        "value": "dummy"
+                    },
+                    {
+                        "name": "METADATA_URL",
+                        "value": "https://garm.garm-provider-test.t09.de/api/v1/metadata"
+                    },
+                    {
+                        "name": "BEARER_TOKEN",
+                        "value": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlYTc2MjgxLWM2ZTYtNDRkNy04M2IwLTA3YjZjNTRhNWNmMCIsIm5hbWUiOiJnYXJtLUROendIZnB3ajJJcSIsInByb3ZpZGVyX2lkIjoiNTBmYTY4YTUtY2FkZi00ZDg0LWE3OGEtZWFmZWIzYmZkMGIwIiwic2NvcGUiOiJyZXBvc2l0b3J5IiwiZW50aXR5IjoiQ2hyaXN0b3BoZXIuSGFzZS9nYXJtLXRlc3QiLCJjcmVhdGVfYXR0ZW1wdCI6MCwiZm9yZ2VfdHlwZSI6ImdpdGVhIiwiaXNzIjoiZ2FybSIsImV4cCI6MTc1NzQxOTg0MX0.ukbdJo7n64m9l2olye3NRq3KK59iFVjXY5eom08W2UQ"
+                    },
+                    {
+                        "name": "CALLBACK_URL",
+                        "value": "https://garm.garm-provider-test.t09.de/api/v1/callbacks"
+                    },
+                    {
+                        "name": "JIT_CONFIG_ENABLED",
+                        "value": "false"
                     }
                 ],
-                "restartPolicy": "Never",
-                "volumes": [
+                "image": "edp.buildth.ing/devfw-cicd/garm-act-runner:1",
+                "imagePullPolicy": "Always",
+                "name": "mganter-test",
+                "resources": {
+                },
+                "volumeMounts": [
                     {
-                        "emptyDir": {
-                        },
-                        "name": "cache-volume"
+                      "mountPath": "/runner",
+                      "name": "cache-volume"
                     }
                 ]
-            }
-        }
+            }          
+        ],
+            "volumes": [
+                {
+                  "name": "cache-volume",
+                  "emptyDir": {}
+                }
+            ]
     },
     "status": {
     }