diff --git a/cli/internal/cloudcmd/create.go b/cli/internal/cloudcmd/create.go
index cea948dc5..86cd7a1a2 100644
--- a/cli/internal/cloudcmd/create.go
+++ b/cli/internal/cloudcmd/create.go
@@ -18,12 +18,12 @@ import (
 	"strings"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/clusterid"
+	"github.com/edgelesssys/constellation/v2/cli/internal/image"
 	"github.com/edgelesssys/constellation/v2/cli/internal/libvirt"
 	"github.com/edgelesssys/constellation/v2/cli/internal/terraform"
 	"github.com/edgelesssys/constellation/v2/internal/cloud/cloudprovider"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/constants"
-	"github.com/edgelesssys/constellation/v2/internal/image"
 )
 
 // Creator creates cloud resources.
diff --git a/cli/internal/cmd/upgradeexecute.go b/cli/internal/cmd/upgradeexecute.go
index 7f8c51b09..9d4857370 100644
--- a/cli/internal/cmd/upgradeexecute.go
+++ b/cli/internal/cmd/upgradeexecute.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/edgelesssys/constellation/v2/cli/internal/cloudcmd"
+	"github.com/edgelesssys/constellation/v2/cli/internal/image"
 	"github.com/edgelesssys/constellation/v2/internal/attestation/measurements"
 	"github.com/edgelesssys/constellation/v2/internal/config"
 	"github.com/edgelesssys/constellation/v2/internal/file"
-	"github.com/edgelesssys/constellation/v2/internal/image"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 )
diff --git a/internal/image/image.go b/cli/internal/image/image.go
similarity index 100%
rename from internal/image/image.go
rename to cli/internal/image/image.go
diff --git a/internal/image/image_test.go b/cli/internal/image/image_test.go
similarity index 100%
rename from internal/image/image_test.go
rename to cli/internal/image/image_test.go
diff --git a/internal/image/raw.go b/cli/internal/image/raw.go
similarity index 100%
rename from internal/image/raw.go
rename to cli/internal/image/raw.go
diff --git a/internal/image/raw_test.go b/cli/internal/image/raw_test.go
similarity index 100%
rename from internal/image/raw_test.go
rename to cli/internal/image/raw_test.go