diff --git a/build-kaniko.jenkins b/build-kaniko.jenkins
index 7802b24..1d4f1d5 100644
--- a/build-kaniko.jenkins
+++ b/build-kaniko.jenkins
@@ -14,50 +14,73 @@
 def repository = "registry.c.test-chamber-13.lan"
 def repositoryCreds = "harbor-repository-creds"
 
-def dockerFile = """FROM ${repository}/google/kaniko-project/executor:debug
-
-LABEL maintainer="The_Spider <spider@smoothnet.org>"
-
-COPY ./kaniko-chain.crt /kaniko/ssl/certs/ca-certificates.crt
-"""
+def workspace
+def dockerFile
 
 def label = "kubernetes-${UUID.randomUUID().toString()}"
 def templateName = "pipeline-worker"
-podTemplate (
-    label: label,
-    name: templateName,
-    yaml: functions.podYaml(
-        repo: repository,
-        templateName: templateName,
-        [
-            [
-                name: "kaniko",
-                path: "${repository}/google/kaniko-project/executor:debug",
-                command: "/busybox/sh"
-            ]
-        ]
-    )
-){
-    node (label) {
-        def workspace = pwd()
+pipeline {
+    agent {
+        kubernetes {
+            yaml functions.podYaml(
+                repo: repository,
+                templateName: templateName,
+                kaniko: true
+            )
+        }
+    }
 
-        writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA())
+    stages {
+        stage ('Initalize Jenkins') {
+            steps {
+                script {
+                    workspace = pwd()
+                    dockerFile = """FROM ${repository}/google/kaniko-project/executor:debug
 
-        stage ("Add Cert to Kaniko") {
-            container ("kaniko") {
-                def localRootCA = functions.getLocalRootCA()
-                sh """
-                    printf '%s\\n' "${localRootCA}" >> /kaniko/ssl/certs/ca-certificates.crt
-                    cp "/kaniko/ssl/certs/ca-certificates.crt" "${workspace}/kaniko-chain.crt"
-                """
+LABEL org.opencontainers.image.authors="The_Spider <spider@smoothnet.org>"
+LABEL org.opencontainers.image.title="kaniko"
+LABEL org.opencontainers.image.description="Docker container for building docker containers"
+LABEL org.opencontainers.image.base.name="gcr.io/kaniko-project/executor:debug"
+
+COPY ./kaniko-chain.crt /kaniko/ssl/certs/ca-certificates.crt
+"""
+                    writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA())
+                }
             }
         }
 
-        functions.buildContainer(
-            repository: repository,
-            imageDest: "${repository}/library/kaniko:latest",
-            dockerFile: dockerFile,
-            repoCreds: repositoryCreds,
-        )
+        stage ("Add Cert to Kaniko") {
+            steps {
+                container ("kaniko") {
+                    script {
+                        sh """
+                            printf '%s\\n' "${functions.getLocalRootCA()}" >> /kaniko/ssl/certs/ca-certificates.crt
+                            cp "/kaniko/ssl/certs/ca-certificates.crt" "${workspace}/kaniko-chain.crt"
+                        """
+                    }
+                }
+            }
+        }
+
+        stage ('Build & Push') {
+            steps {
+                container ('kaniko') {
+                    script {
+                        declarativeFunctions.buildContainerMultipleDestinations(
+                            dockerFile: dockerFile,
+                            repositoryAccess: [
+                                [
+                                    repository: repository,
+                                    credentials: repositoryCreds
+                                ],
+                            ],
+                            destination: [
+                                "${repository}/library/kaniko:latest",
+                            ]
+                        )
+                    }
+                }
+            }
+        }
     }
 }
\ No newline at end of file