diff --git a/Dockerfile b/Dockerfile
index d1a08cc4c93fb834ae6b245b8c406458633d5f27..67e7f74a72f02374021d6e1351dc5d3fdd846bb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,11 @@ ENV FECRU_INST /opt/atlassian/fecru
 ENV FECRU_HOME /var/opt/atlassian/application-data/fecru
 ENV SYSTEM_USER fecru
 ENV SYSTEM_GROUP fecru
+ENV SYSTEM_GID 3001
+ENV SYSTEM_UID 3001
 ENV SYSTEM_HOME /home/fecru
 
+
 USER root
 
 COPY fisheye-${VERSION}.zip /tmp/
@@ -37,21 +40,20 @@ RUN dnf -y update && dnf -y upgrade \
     && mkdir -p ${FECRU_INST} \
     && mkdir -p ${FECRU_HOME} \
     && mkdir -p /home/${SYSTEM_USER} \
-    && addgroup -S ${SYSTEM_GROUP} \
-    && adduser -S -D -G ${SYSTEM_GROUP} -h ${SYSTEM_GROUP} -s /bin/sh ${SYSTEM_USER} \
+    && groupadd --gid ${SYSTEM_GID} ${SYSTEM_GROUP} \
+    && useradd --uid ${SYSTEM_UID} --gid ${SYSTEM_GID} --home-dir ${SYSTEM_HOME} ${SYSTEM_USER} \
     && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} /home/${SYSTEM_USER} \
     && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_INST} \
-    && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_HOME}
+    && chown -R ${SYSTEM_USER}:${SYSTEM_GROUP} ${FECRU_HOME} \
     && dnf -y install git unzip \
     && unzip /tmp/fisheye-${VERSION}.zip -d /tmp/ \
     && mv /tmp/fecru-${VERSION}/* ${FECRU_INST} \
     && rm -rf /tmp/fecru-${VERSION} \
     && rm /tmp/fisheye-${VERSION}.zip \
-    && dnf clean all
+    && dnf -y clean all \
     && touch -d "@0" "${FECRU_INST}/config.xml" \
     && touch -d "@0" "${FECRU_INST}/bin/fisheyectl.sh"
 
-#  && apk add openssh git unzip xmlstarlet wget ca-certificates --update-cache --allow-untrusted --repository http://dl-cdn.alpinelinux.org/alpine/edge/main --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
 
 ADD scripts/service /usr/local/bin/service
 ADD scripts/entrypoint /usr/local/bin/entrypoint
diff --git a/README.md b/README.md
index b1efe4134d2a4788fa2319f4e83cab1068bb9b2f..c0b15d0469943af7c7367b35eedd87f58d27641b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # docker-atlassian-fecru
 
-This is a Docker-Image for Atlassian Fisheye/Crucible based on [UBI](http://registry1.dsop.ioalpinelinux.org/), which is kept as small as possible.
+This is a Docker-Image for Atlassian Fisheye/Crucible based on [UBI + OpenJDK 8](https://registry1.dsop.io/harbor/projects/3/repositories/redhat%2Fopenjdk%2Fopenjdk8/), which is kept as small as possible.
 
 ## Features
 
diff --git a/download.yaml b/download.yaml
index d86b0502841ca11b22e03c0b90f6164e0cce3954..1c150334105465a5b373e09015728431bcbea658 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
   - url: https://product-downloads.atlassian.com/software/fisheye/downloads/fisheye-4.8.4.zip
-    filename: "fishey-4.8.4.zip"
+    filename: "fisheye-4.8.4.zip"
     validation:
       type: sha512
       value: 15233500e1ae836646a26b4fdc7000460262c1aeb9da10c0127f49840f66fc31d07be569db8360fa2c00a613650577ff754422f32f8dbb251b43451d87fd6b7d