diff --git a/core/startos/src/s9pk/v2/pack.rs b/core/startos/src/s9pk/v2/pack.rs
index be81d9e78..9464e1ce1 100644
--- a/core/startos/src/s9pk/v2/pack.rs
+++ b/core/startos/src/s9pk/v2/pack.rs
@@ -422,6 +422,9 @@ impl ImageSource {
                     // docker buildx build ${path} -o type=image,name=start9/${id}
                     let tag = format!("start9/{id}/{image_id}:{}", new_guid());
                     let mut command = Command::new(CONTAINER_TOOL);
+                    if CONTAINER_TOOL == "docker" {
+                        command.arg("buildx");
+                    }
                     command
                         .arg("build")
                         .arg(workdir)
@@ -553,6 +556,7 @@ impl ImageSource {
                         Command::new(CONTAINER_TOOL)
                             .arg("create")
                             .arg(&docker_platform)
+                            .arg("--entrypoint=/bin/sh")
                             .arg(&tag)
                             .invoke(ErrorKind::Docker)
                             .await?,
diff --git a/sdk/base/lib/actions/setupActions.ts b/sdk/base/lib/actions/setupActions.ts
index 203f81a32..602530c3d 100644
--- a/sdk/base/lib/actions/setupActions.ts
+++ b/sdk/base/lib/actions/setupActions.ts
@@ -13,7 +13,7 @@ export type Run<
     | InputSpec<Record<string, never>, never>,
 > = (options: {
   effects: T.Effects
-  input: ExtractInputSpecType<A> & Record<string, any>
+  input: ExtractInputSpecType<A>
 }) => Promise<(T.ActionResult & { version: "1" }) | null | void | undefined>
 export type GetInput<
   A extends
@@ -22,12 +22,7 @@ export type GetInput<
     | InputSpec<Record<string, any>, never>,
 > = (options: {
   effects: T.Effects
-}) => Promise<
-  | null
-  | void
-  | undefined
-  | (ExtractPartialInputSpecType<A> & Record<string, any>)
->
+}) => Promise<null | void | undefined | ExtractPartialInputSpecType<A>>
 
 export type MaybeFn<T> = T | ((options: { effects: T.Effects }) => Promise<T>)
 function callMaybeFn<T>(
@@ -63,8 +58,8 @@ export class Action<
     readonly id: Id,
     private readonly metadataFn: MaybeFn<T.ActionMetadata>,
     private readonly inputSpec: InputSpecType,
-    private readonly getInputFn: GetInput<ExtractInputSpecType<InputSpecType>>,
-    private readonly runFn: Run<ExtractInputSpecType<InputSpecType>>,
+    private readonly getInputFn: GetInput<InputSpecType>,
+    private readonly runFn: Run<InputSpecType>,
   ) {}
   static withInput<
     Id extends T.ActionId,
@@ -77,8 +72,8 @@ export class Action<
     id: Id,
     metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
     inputSpec: InputSpecType,
-    getInput: GetInput<ExtractInputSpecType<InputSpecType>>,
-    run: Run<ExtractInputSpecType<InputSpecType>>,
+    getInput: GetInput<InputSpecType>,
+    run: Run<InputSpecType>,
   ): Action<Id, Store, InputSpecType> {
     return new Action(
       id,
diff --git a/sdk/package/lib/StartSdk.ts b/sdk/package/lib/StartSdk.ts
index 667e4297b..9b3349e83 100644
--- a/sdk/package/lib/StartSdk.ts
+++ b/sdk/package/lib/StartSdk.ts
@@ -301,14 +301,12 @@ export class StartSdk<Manifest extends T.SDKManifest, Store> {
             | Record<string, any>
             | InputSpec<any, any>
             | InputSpec<any, never>,
-          Type extends
-            ExtractInputSpecType<InputSpecType> = ExtractInputSpecType<InputSpecType>,
         >(
           id: Id,
           metadata: MaybeFn<Omit<T.ActionMetadata, "hasInput">>,
           inputSpec: InputSpecType,
-          getInput: GetInput<Type>,
-          run: Run<Type>,
+          getInput: GetInput<InputSpecType>,
+          run: Run<InputSpecType>,
         ) => Action.withInput(id, metadata, inputSpec, getInput, run),
         /**
          * @description Use this function to create an action that does not accept form input
diff --git a/sdk/package/package-lock.json b/sdk/package/package-lock.json
index 0008ed4b8..555599d81 100644
--- a/sdk/package/package-lock.json
+++ b/sdk/package/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.5",
+  "version": "0.3.6-beta.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@start9labs/start-sdk",
-      "version": "0.3.6-beta.5",
+      "version": "0.3.6-beta.6",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^2.2.5",
diff --git a/sdk/package/package.json b/sdk/package/package.json
index 74acf7a26..abc7bb5fb 100644
--- a/sdk/package/package.json
+++ b/sdk/package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@start9labs/start-sdk",
-  "version": "0.3.6-beta.5",
+  "version": "0.3.6-beta.6",
   "description": "Software development kit to facilitate packaging services for StartOS",
   "main": "./package/lib/index.js",
   "types": "./package/lib/index.d.ts",