diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index 2ff41cab900c69834f7438bf6d06f3ce034ef7ed..1c1f89acbf0ad64f7a2fa12f5a36fd1f8c7c079d 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -28,12 +28,8 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.security.Principal;
-import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 @Log4j2
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
index 9a1ccac5d973086bd8e3d3521515490f75f6789b..9eba0e20b8ac3facfb562e4e004727f73a605fe4 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
@@ -3,11 +3,7 @@ package at.tuwien.service;
 import at.tuwien.BaseUnitTest;
 import at.tuwien.api.container.ContainerCreateRequestDto;
 import at.tuwien.config.ReadyConfig;
-import at.tuwien.entities.container.Container;
 import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.DockerClientException;
-import at.tuwien.exception.ImageNotFoundException;
-import at.tuwien.exception.UserNotFoundException;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.UserRepository;
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
index 0b84a7246d2288dd5e04837d79e5e9430189dab1..65259b9f21f9ca9a6c1b9eb4502edaf932cbb753 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java
@@ -3,8 +3,8 @@ package at.tuwien.service;
 import at.tuwien.BaseUnitTest;
 import at.tuwien.api.container.image.ImageCreateDto;
 import at.tuwien.config.ReadyConfig;
+import at.tuwien.entities.container.image.ContainerImage;
 import at.tuwien.exception.*;
-import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.UserRepository;
@@ -19,7 +19,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.security.Principal;
 
@@ -43,19 +42,14 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private UserRepository userRepository;
 
-    @Autowired
-    private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
-
     @Autowired
     private ContainerRepository containerRepository;
 
     @BeforeEach
     public void beforeEach() {
         userRepository.save(USER_1);
+        imageRepository.save(IMAGE_2);
         imageRepository.save(IMAGE_1);
-        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
-        IMAGE_1.setEnvironment(IMAGE_1_ENV);
-        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
     }
 
     @Test
diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java
index 557fda530f58705fce94016eafb0d68b6a419d92..3a54d15686933aa2746930f4fbab6b7c176d802a 100644
--- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java
+++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/Old.java
@@ -6,7 +6,6 @@ import at.tuwien.config.DockerUtil;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.container.Container;
 import at.tuwien.exception.*;
-import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.UserRepository;
@@ -17,7 +16,6 @@ import lombok.extern.log4j.Log4j2;
 import org.apache.http.auth.BasicUserPrincipal;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -49,9 +47,6 @@ public class Old extends BaseUnitTest {
     @Autowired
     private ImageRepository imageRepository;
 
-    @Autowired
-    private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
-
     @Autowired
     private DockerClient dockerClient;
 
@@ -86,9 +81,6 @@ public class Old extends BaseUnitTest {
         /* mock data */
         userRepository.save(USER_1);
         imageRepository.save(IMAGE_1);
-        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
-        IMAGE_1.setEnvironment(IMAGE_1_ENV);
-        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
     }
 
     @AfterEach
diff --git a/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java b/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java
deleted file mode 100644
index aa1504a292588a11911b831d415bf1f864d9246d..0000000000000000000000000000000000000000
--- a/fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.tuwien.repository.jpa;
-
-import at.tuwien.entities.container.image.ContainerImageEnvironmentItem;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ContainerImageEnvironmentItemRepository extends JpaRepository<ContainerImageEnvironmentItem, Long> {
-
-}