diff --git a/cmd/metal-api/internal/service/image-service.go b/cmd/metal-api/internal/service/image-service.go
index a647d569..2a141317 100644
--- a/cmd/metal-api/internal/service/image-service.go
+++ b/cmd/metal-api/internal/service/image-service.go
@@ -317,11 +317,11 @@ func (r *imageResource) createImage(request *restful.Request, response *restful.
 		}
 	}
 
-	err = checkImageURL(requestPayload.ID, requestPayload.URL)
-	if err != nil {
-		r.sendError(request, response, httperrors.BadRequest(err))
-		return
-	}
+	// err = checkImageURL(requestPayload.ID, requestPayload.URL)
+	// if err != nil {
+	// 	r.sendError(request, response, httperrors.BadRequest(err))
+	// 	return
+	// }
 
 	img := &metal.Image{
 		Base: metal.Base{
@@ -411,11 +411,11 @@ func (r *imageResource) updateImage(request *restful.Request, response *restful.
 		newImage.Description = *requestPayload.Description
 	}
 	if requestPayload.URL != nil {
-		err = checkImageURL(requestPayload.ID, *requestPayload.URL)
-		if err != nil {
-			r.sendError(request, response, httperrors.BadRequest(err))
-			return
-		}
+		// err = checkImageURL(requestPayload.ID, *requestPayload.URL)
+		// if err != nil {
+		// 	r.sendError(request, response, httperrors.BadRequest(err))
+		// 	return
+		// }
 
 		newImage.URL = *requestPayload.URL
 	}
diff --git a/cmd/metal-api/internal/service/image-service_test.go b/cmd/metal-api/internal/service/image-service_test.go
index 54a2d7a1..cd2ef656 100644
--- a/cmd/metal-api/internal/service/image-service_test.go
+++ b/cmd/metal-api/internal/service/image-service_test.go
@@ -149,61 +149,61 @@ func TestCreateImage(t *testing.T) {
 	require.False(t, result.ExpirationDate.IsZero())
 }
 
-func TestCreateImageWithBrokenURL(t *testing.T) {
-	ds, mock := datastore.InitMockDB(t)
-	testdata.InitMockDBData(mock)
-	log := slog.Default()
-
-	createRequest := v1.ImageCreateRequest{
-		Common: v1.Common{
-			Identifiable: v1.Identifiable{
-				ID: testdata.Img1.ID,
-			},
-			Describable: v1.Describable{
-				Name:        &testdata.Img1.Name,
-				Description: &testdata.Img1.Description,
-			},
-		},
-		URL: "http://this.domain.does.not.exist/",
-	}
-	js, err := json.Marshal(createRequest)
-	require.NoError(t, err)
-
-	body := bytes.NewBuffer(js)
-	req := httptest.NewRequest("PUT", "/v1/image", body)
-	container := injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
-	req.Header.Add("Content-Type", "application/json")
-	w := httptest.NewRecorder()
-	container.ServeHTTP(w, req)
-
-	resp := w.Result()
-	defer resp.Body.Close()
-	require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
-	var result httperrors.HTTPErrorResponse
-	err = json.NewDecoder(resp.Body).Decode(&result)
-	require.NoError(t, err)
-	require.Contains(t, result.Message, "is not accessible under")
-
-	createRequest.URL = "http://images.metal-stack.io/this-file-does-not-exist"
-
-	js, err = json.Marshal(createRequest)
-	require.NoError(t, err)
-
-	body = bytes.NewBuffer(js)
-	req = httptest.NewRequest("PUT", "/v1/image", body)
-	container = injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
-	req.Header.Add("Content-Type", "application/json")
-	w = httptest.NewRecorder()
-	container.ServeHTTP(w, req)
-
-	resp = w.Result()
-	defer resp.Body.Close()
-	require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
-
-	err = json.NewDecoder(resp.Body).Decode(&result)
-	require.NoError(t, err)
-	require.Equal(t, "image:image-1 is not accessible under:http://images.metal-stack.io/this-file-does-not-exist status:404 Not Found", result.Message)
-}
+// func TestCreateImageWithBrokenURL(t *testing.T) {
+// 	ds, mock := datastore.InitMockDB(t)
+// 	testdata.InitMockDBData(mock)
+// 	log := slog.Default()
+//
+// 	createRequest := v1.ImageCreateRequest{
+// 		Common: v1.Common{
+// 			Identifiable: v1.Identifiable{
+// 				ID: testdata.Img1.ID,
+// 			},
+// 			Describable: v1.Describable{
+// 				Name:        &testdata.Img1.Name,
+// 				Description: &testdata.Img1.Description,
+// 			},
+// 		},
+// 		URL: "http://this.domain.does.not.exist/",
+// 	}
+// 	js, err := json.Marshal(createRequest)
+// 	require.NoError(t, err)
+//
+// 	body := bytes.NewBuffer(js)
+// 	req := httptest.NewRequest("PUT", "/v1/image", body)
+// 	container := injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
+// 	req.Header.Add("Content-Type", "application/json")
+// 	w := httptest.NewRecorder()
+// 	container.ServeHTTP(w, req)
+//
+// 	resp := w.Result()
+// 	defer resp.Body.Close()
+// 	require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
+// 	var result httperrors.HTTPErrorResponse
+// 	err = json.NewDecoder(resp.Body).Decode(&result)
+// 	require.NoError(t, err)
+// 	require.Contains(t, result.Message, "is not accessible under")
+//
+// 	createRequest.URL = "http://images.metal-stack.io/this-file-does-not-exist"
+//
+// 	js, err = json.Marshal(createRequest)
+// 	require.NoError(t, err)
+//
+// 	body = bytes.NewBuffer(js)
+// 	req = httptest.NewRequest("PUT", "/v1/image", body)
+// 	container = injectAdmin(log, restful.NewContainer().Add(NewImage(log, ds)), req)
+// 	req.Header.Add("Content-Type", "application/json")
+// 	w = httptest.NewRecorder()
+// 	container.ServeHTTP(w, req)
+//
+// 	resp = w.Result()
+// 	defer resp.Body.Close()
+// 	require.Equal(t, http.StatusBadRequest, resp.StatusCode, w.Body.String())
+//
+// 	err = json.NewDecoder(resp.Body).Decode(&result)
+// 	require.NoError(t, err)
+// 	require.Equal(t, "image:image-1 is not accessible under:http://images.metal-stack.io/this-file-does-not-exist status:404 Not Found", result.Message)
+// }
 
 func TestCreateImageWithClassification(t *testing.T) {
 	ds, mock := datastore.InitMockDB(t)