diff --git a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.html b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.html
index 0c9598a2bfb..2d84ff7c611 100644
--- a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.html
+++ b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.html
@@ -57,36 +57,38 @@
       </ix-fieldset>
     }
 
-    <ix-fieldset [title]="'Environment' | translate">
-      <ix-list
-        formArrayName="environmentVariables"
-        [empty]="form.controls.environmentVariables.controls.length === 0"
-        [label]="'Environment Variables' | translate"
-        (add)="addEnvironmentVariable()"
-      >
-        @for (envControl of form.controls.environmentVariables.controls; track envControl; let i = $index) {
-          <ix-list-item
-            [formGroupName]="i"
-            [label]="'Environment Variable' | translate"
-            (delete)="removeEnvironmentVariable(i)"
-          >
-            <div class="environment-variable">
-              <ix-input
-                formControlName="name"
-                [label]="'Name' | translate"
-                [required]="true"
-              ></ix-input>
+    @if (isContainer) {
+      <ix-fieldset [title]="'Environment' | translate">
+        <ix-list
+          formArrayName="environmentVariables"
+          [empty]="form.controls.environmentVariables.controls.length === 0"
+          [label]="'Environment Variables' | translate"
+          (add)="addEnvironmentVariable()"
+        >
+          @for (envControl of form.controls.environmentVariables.controls; track envControl; let i = $index) {
+            <ix-list-item
+              [formGroupName]="i"
+              [label]="'Environment Variable' | translate"
+              (delete)="removeEnvironmentVariable(i)"
+            >
+              <div class="environment-variable">
+                <ix-input
+                  formControlName="name"
+                  [label]="'Name' | translate"
+                  [required]="true"
+                ></ix-input>
 
-              <ix-input
-                formControlName="value"
-                [label]="'Value' | translate"
-                [required]="true"
-              ></ix-input>
-            </div>
-          </ix-list-item>
-        }
-      </ix-list>
-    </ix-fieldset>
+                <ix-input
+                  formControlName="value"
+                  [label]="'Value' | translate"
+                  [required]="true"
+                ></ix-input>
+              </div>
+            </ix-list-item>
+          }
+        </ix-list>
+      </ix-fieldset>
+    }
 
     @if (isVm) {
       <ix-fieldset [title]="'Security' | translate">
diff --git a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.spec.ts b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.spec.ts
index 39ae9be86de..8787d6b65f7 100644
--- a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.spec.ts
+++ b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.spec.ts
@@ -111,7 +111,6 @@ describe('InstanceEditFormComponent', () => {
         autostart: true,
         cpu: '2-5',
         memory: GiB,
-        environment: {},
         enable_vnc: true,
         vnc_port: 9000,
         vnc_password: 'testing',
diff --git a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.ts b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.ts
index d48148cc30d..04b043fe4fc 100644
--- a/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.ts
+++ b/src/app/pages/instances/components/all-instances/instance-details/instance-general-info/instance-edit-form/instance-edit-form.component.ts
@@ -68,6 +68,10 @@ export class InstanceEditFormComponent {
     return this.editingInstance.type === VirtualizationType.Vm;
   }
 
+  get isContainer(): boolean {
+    return this.editingInstance.type === VirtualizationType.Container;
+  }
+
   get isStopped(): boolean {
     return this.editingInstance.status === VirtualizationStatus.Stopped;
   }
@@ -154,13 +158,13 @@ export class InstanceEditFormComponent {
     const values = this.form.getRawValue();
 
     let payload = {
-      environment: this.environmentVariablesPayload,
       autostart: values.autostart,
       cpu: values.cpu,
       memory: values.memory || null,
       enable_vnc: values.enable_vnc,
       vnc_port: values.enable_vnc ? values.vnc_port || defaultVncPort : null,
       vnc_password: values.enable_vnc ? values.vnc_password : null,
+      ...(this.isContainer ? { environment: this.environmentVariablesPayload } : null),
     } as UpdateVirtualizationInstance;
 
     if (payload.enable_vnc) {