diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index 867d25c1f..54bf7e8dc 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -167,7 +167,8 @@ cmd-git-from-image() {
 
   dokku_log_verbose "Setting Dockerfile"
   touch "$TMP_WORK_DIR/Dockerfile"
-  echo "FROM $DOCKER_IMAGE" >"$TMP_WORK_DIR/Dockerfile"
+  echo "FROM $DOCKER_IMAGE" >>"$TMP_WORK_DIR/Dockerfile"
+  echo "LABEL com.dokku.docker-image-labeler/alternate-tags=\"[\"linuxserver/foldingathome:7.5.1-ls1\"]\"" >>"$TMP_WORK_DIR/Dockerfile"
 
   plugn trigger git-from-directory "$APP" "$TMP_WORK_DIR" "$USER_NAME" "$USER_EMAIL"
 }
diff --git a/tests/unit/git_4.bats b/tests/unit/git_4.bats
index f000042e2..6d26de148 100644
--- a/tests/unit/git_4.bats
+++ b/tests/unit/git_4.bats
@@ -116,3 +116,16 @@ EOF
   echo "status: $status"
   assert_failure
 }
+
+@test "(git) git:from-image labels correctly" {
+  run /bin/bash -c "dokku git:from-image $TEST_APP linuxserver/foldingathome:7.5.1-ls1"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "docker image inspect dokku/$TEST_APP:latest --format '{{ index .Config.Labels \"com.dokku.docker-image-labeler/alternate-tags\" }}'"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+  assert_output_contains "linuxserver/foldingathome:7.5.1-ls1"
+}