diff --git a/Dockerfile b/Dockerfile
index b1dcc5f..7e68bfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,10 +52,5 @@ RUN wget https://dl.google.com/go/go$GOLANG_VERSION.linux-amd64.tar.gz \
     && tar -C /usr/local -xzf go$GOLANG_VERSION.linux-amd64.tar.gz \
     && echo export PATH=$PATH:/usr/local/go/bin >> /root/.bashrc
 
-# TODO: support selecting tag of mender-convert with MENDER_CONVERT_VERSION
-# TODO: consider lighter way to download to avoid git dependency
-RUN git clone https://github.com/mendersoftware/mender-convert.git
-
-
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
diff --git a/docker-mender-convert b/docker-mender-convert
index 5691b28..24e3ccb 100755
--- a/docker-mender-convert
+++ b/docker-mender-convert
@@ -4,13 +4,10 @@ set -e
 
 IMAGE_NAME=mender-convert
 
-INPUT_DIR="$(pwd)/input"
-OUTPUT_DIR="$(pwd)/output"
-
-mkdir -p $OUTPUT_DIR
+MENDER_CONVERT_DIR="$(pwd)"
+mkdir -p output
 
 docker run \
-       --mount type=bind,source=$INPUT_DIR,target=/mender-convert/input,readonly \
-       --mount type=bind,source=$OUTPUT_DIR,target=/mender-convert/output \
+       --mount type=bind,source=$MENDER_CONVERT_DIR,target=/mender-convert \
        --privileged=true \
        $IMAGE_NAME "$@"