diff --git a/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts b/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
index 9da35e0b4..a8ce5e185 100644
--- a/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
+++ b/src/Misc/containerEngineHandlers/podmanHandler/src/podmanHandler.ts
@@ -54,7 +54,6 @@ async function run(): Promise<void> {
     const creatArgs = ['create']
     creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`)
     creatArgs.push(`--network=${networkName}`)
-    creatArgs.push(`--entrypoint=${jobContainer.containerEntryPoint}`)
 
     for (const mountVolume of jobContainer.mountVolumes) {
       creatArgs.push(
@@ -62,8 +61,10 @@ async function run(): Promise<void> {
       )
     }
 
+    creatArgs.push(`--entrypoint=tail`)
     creatArgs.push(containerImage)
-    creatArgs.push(jobContainer.containerEntryPointArgs)
+    creatArgs.push(`-f`)
+    creatArgs.push(`/dev/null`)
 
     core.debug(JSON.stringify(creatArgs))
 
diff --git a/src/Misc/layoutbin/podmanHandler/index.js b/src/Misc/layoutbin/podmanHandler/index.js
index 7722e2b58..225266786 100644
--- a/src/Misc/layoutbin/podmanHandler/index.js
+++ b/src/Misc/layoutbin/podmanHandler/index.js
@@ -1092,12 +1092,13 @@ function run() {
             const creatArgs = ['create'];
             creatArgs.push(`--workdir=${jobContainer.containerWorkDirectory}`);
             creatArgs.push(`--network=${networkName}`);
-            creatArgs.push(`--entrypoint=${jobContainer.containerEntryPoint}`);
             for (const mountVolume of jobContainer.mountVolumes) {
                 creatArgs.push(`-v=${mountVolume.sourceVolumePath}:${mountVolume.targetVolumePath}`);
             }
+            creatArgs.push(`--entrypoint=tail`);
             creatArgs.push(containerImage);
-            creatArgs.push(jobContainer.containerEntryPointArgs);
+            creatArgs.push(`-f`);
+            creatArgs.push(`/dev/null`);
             core.debug(JSON.stringify(creatArgs));
             // const containerId = await exec.getExecOutput('podman', [
             //   'create',