diff --git a/.env.unix.example b/.env.unix.example
index f4b233b80f0c82b1e079d529e41b3552de07bce2..eec8b3c7bde116df329651c2e18f6b1cd7ac1290 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -18,8 +18,8 @@ WEBSITE=http://localhost
 GATEWAY_ENDPOINT=http://gateway-service:9095
 TOKEN_MAX=5
 LOG_LEVEL=trace # error, warning, info, debug, trace
-DOI_URL=https://doi.org
-DATACITE_URL=https://api.datacite.org
-DATACITE_PREFIX=10.1234
-DATACITE_USERNAME=username
-DATACITE_PASSWORD=password
\ No newline at end of file
+DOI_URL="https://doi.org"
+DATACITE_URL="https://api.datacite.org"
+DATACITE_PREFIX="10.1234"
+DATACITE_USERNAME="username"
+DATACITE_PASSWORD="password"
diff --git a/dbrepo-container-service/Dockerfile b/dbrepo-container-service/Dockerfile
index 71b0991dcc7e2f5c84f7cbb419621499a5258573..cab97691b1873da1c6b5e1597ada8e3b1c7cfe1e 100644
--- a/dbrepo-container-service/Dockerfile
+++ b/dbrepo-container-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-container-service/rest-service/src/main/resources/application-local.yml b/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
index c02b1b829ce4a8a0588aa94e877bd255f82543bf..ca57158d4d162611602df256c838fdb3c2bb4b08 100644
--- a/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-container-service/rest-service/src/main/resources/application-local.yml
@@ -46,7 +46,7 @@ fda:
   mount.path: /tmp
   ready.path: ./ready
   jwt:
-    issuer: http://localhost:8443/realms/dbrepo
+    issuer: https://localhost:8443/realms/dbrepo
     public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
   client_secret: client-secret
   client_id: dbrepo-client
diff --git a/dbrepo-database-service/Dockerfile b/dbrepo-database-service/Dockerfile
index f287e8e51c0769f76dac8881c81ffc175aff4073..b181da3570e0e9461a27a3b91be26e2d85ae151b 100644
--- a/dbrepo-database-service/Dockerfile
+++ b/dbrepo-database-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-database-service/rest-service/src/main/resources/application-local.yml b/dbrepo-database-service/rest-service/src/main/resources/application-local.yml
index 93295575889343b2d9d3e4b10e70886ccb3dd1a1..c6bb7a1caaa6caf9aa606d0a8764a2cfb03b1e03 100644
--- a/dbrepo-database-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-database-service/rest-service/src/main/resources/application-local.yml
@@ -47,7 +47,7 @@ fda:
     password: elastic
   ready.path: ./ready
   jwt:
-    issuer: http://localhost:8443/realms/dbrepo
+    issuer: https://localhost:8443/realms/dbrepo
     public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
   client_secret: client-secret
   client_id: dbrepo-client
diff --git a/dbrepo-discovery-service/Dockerfile b/dbrepo-discovery-service/Dockerfile
index 8cbe9357c09b0970577ffa000ec3476800bbdb1a..b216c09e0936a2af0b4f12f097a99723ab65bc7f 100644
--- a/dbrepo-discovery-service/Dockerfile
+++ b/dbrepo-discovery-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-gateway-service/Dockerfile b/dbrepo-gateway-service/Dockerfile
index c30a04e0c411762a68e585a4dab2c4e3072d00c4..7fd33750f721c204635b9c51e91365ae439a3bc7 100644
--- a/dbrepo-gateway-service/Dockerfile
+++ b/dbrepo-gateway-service/Dockerfile
@@ -15,7 +15,7 @@ COPY ./report ./report
 COPY ./rest-service ./rest-service
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### SECOND STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-identifier-service/Dockerfile b/dbrepo-identifier-service/Dockerfile
index 13204336ab7166f2648197122cc173008d530f96..b8343cc968c5fa7475a99e40a7c4d079fae37266 100644
--- a/dbrepo-identifier-service/Dockerfile
+++ b/dbrepo-identifier-service/Dockerfile
@@ -17,7 +17,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java b/dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
index f92574b85fea331e54d13690d39446ca0dbaa77e..eb7f335e0e95a5ca8f149a17ebe4371b621d044f 100644
--- a/dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
+++ b/dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
@@ -135,7 +135,7 @@ public class IdentifierEndpoint {
                                                 @NotNull Principal principal)
             throws IdentifierAlreadyExistsException, QueryNotFoundException, IdentifierPublishingNotAllowedException,
             RemoteUnavailableException, UserNotFoundException, DatabaseNotFoundException, IdentifierRequestException, AccessDeniedException {
-        log.debug("endpoint create identifier, data={}, authorization={}, principal={}", data, authorization, principal);
+        log.debug("endpoint create identifier, data={}, authorization=(hidden), principal={}", data, principal);
         if (data.getType().equals(IdentifierTypeDto.SUBSET) && data.getQid() == null) {
             log.error("Identifier of type subset need to have a qid present");
             throw new IdentifierRequestException("Identifier of type subset need to have a qid present");
diff --git a/dbrepo-identifier-service/rest-service/src/main/resources/application-local.yml b/dbrepo-identifier-service/rest-service/src/main/resources/application-local.yml
index 5e5f8130a7c8a0735c8236b06778fc167ef53b44..bb5c0681e33a5e73cb1287d73e2385dbf54a5675 100644
--- a/dbrepo-identifier-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-identifier-service/rest-service/src/main/resources/application-local.yml
@@ -44,7 +44,7 @@ eureka:
 fda:
   ready.path: ./ready
   jwt:
-    issuer: http://localhost:8443/realms/dbrepo
+    issuer: https://localhost:8443/realms/dbrepo
     public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
   client_secret: client-secret
   client_id: dbrepo-client
diff --git a/dbrepo-metadata-db/Dockerfile b/dbrepo-metadata-db/Dockerfile
index 6dccde6ac2e0228600600aeb8431a16d51f93fc3..264b9e76f3e9a031250f8804a90c8b265a942351 100644
--- a/dbrepo-metadata-db/Dockerfile
+++ b/dbrepo-metadata-db/Dockerfile
@@ -14,7 +14,7 @@ COPY ./querystore ./querystore
 COPY ./test ./test
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 # Install to local repository
 RUN mvn -q clean install > /dev/null
diff --git a/dbrepo-metadata-service/Dockerfile b/dbrepo-metadata-service/Dockerfile
index f9f4f11e7abbd933064311664f2eb51bfdbae121..af0e2b6da4bf0e2b13253487554afbd3e87bd0ef 100644
--- a/dbrepo-metadata-service/Dockerfile
+++ b/dbrepo-metadata-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-query-service/Dockerfile b/dbrepo-query-service/Dockerfile
index 481a93ad52df228c3912bc91a9a8bfd54b8802bd..a8114f56c674d26ea73bc769f91b69c561a8a479 100644
--- a/dbrepo-query-service/Dockerfile
+++ b/dbrepo-query-service/Dockerfile
@@ -17,7 +17,7 @@ COPY ./report ./report
 COPY ./api ./api
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-query-service/rest-service/src/main/resources/application-local.yml b/dbrepo-query-service/rest-service/src/main/resources/application-local.yml
index aa9d106cff733e77b315edc91eb27c2dfef4cca5..ac9c7fb360aa866be92d4530f0ff7550640d47a2 100644
--- a/dbrepo-query-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-query-service/rest-service/src/main/resources/application-local.yml
@@ -48,7 +48,7 @@ fda:
   gateway.endpoint: http://localhost:9095
   ready.path: ./ready
   jwt:
-    issuer: http://localhost:8443/realms/dbrepo
+    issuer: https://localhost:8443/realms/dbrepo
     public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
   client_secret: client-secret
   client_id: dbrepo-client
diff --git a/dbrepo-table-service/Dockerfile b/dbrepo-table-service/Dockerfile
index ebb3999b6243696bce5f776c8b96195af1bebbf7..f4741fc864e57308be33fd48fbdedce6af48f8f7 100644
--- a/dbrepo-table-service/Dockerfile
+++ b/dbrepo-table-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/dbrepo-table-service/rest-service/src/main/resources/application-local.yml b/dbrepo-table-service/rest-service/src/main/resources/application-local.yml
index 71eabd9ce42d70b214ebc0b7d3a957e1718a0a76..ea99819af32bc89472368d14f1b2659054f042d9 100644
--- a/dbrepo-table-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-table-service/rest-service/src/main/resources/application-local.yml
@@ -43,7 +43,7 @@ eureka:
 fda:
   ready.path: ./ready
   jwt:
-    issuer: http://localhost:8443/realms/dbrepo
+    issuer: https://localhost:8443/realms/dbrepo
     public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
   client_secret: client-secret
   client_id: dbrepo-client
diff --git a/dbrepo-ui/components/identifier/Banner.vue b/dbrepo-ui/components/identifier/Banner.vue
index 8756962c9e9b4e3106078e603e1db4209b272fab..ece371663f1d888d8c4ee90c316cc45a163c1eb0 100644
--- a/dbrepo-ui/components/identifier/Banner.vue
+++ b/dbrepo-ui/components/identifier/Banner.vue
@@ -1,10 +1,9 @@
 <template>
-  <p v-if="identifier?.doi">DOI: <a :href="doiUrl(identifier.doi)">{{ identifier.doi }}</a></p>
-  <p v-else-if="identifier?.id"><a :href="pidUrl(identifier.id)">{{ pidUrl(identifier.id) }}</a></p>
+  <div>
+    {{ prefix }}: <a :href="pidUrl">{{ displayName }}</a>
+  </div>
 </template>
-yarn dev
 <script>
-
 export default {
   props: {
     identifier: {
@@ -17,17 +16,34 @@ export default {
   computed: {
     baseUrl () {
       return `${location.protocol}//${location.host}`
-    }
-  },
-  methods: {
-    pidUrl (pid) {
-      return `${this.baseUrl}/pid/${pid}`
     },
-    doiUrl (doi) {
-      return `${this.$config.doiUrl}/${doi}`
+    baseDoi () {
+      return this.$config.doiUrl
+    },
+    isDoi () {
+      if (!this.identifier) {
+        return null
+      }
+      return this.identifier.doi !== null
+    },
+    prefix () {
+      if (!this.identifier) {
+        return null
+      }
+      return this.isDoi ? 'DOI' : 'URI'
+    },
+    pidUrl () {
+      if (!this.identifier) {
+        return null
+      }
+      return this.isDoi ? `${this.baseDoi}/${this.identifier.doi}` : `${this.baseUrl}/pid/${this.identifier.id}`
+    },
+    displayName () {
+      if (!this.identifier) {
+        return null
+      }
+      return this.isDoi ? `${this.identifier.doi}` : `/pid/${this.identifier.id}`
     }
   }
 }
 </script>
-
-<style scoped></style>
diff --git a/dbrepo-ui/nuxt.config.js b/dbrepo-ui/nuxt.config.js
index bdb8304b47149ba99c6afd2a9b218c50373ea921..5cf3275c2760b0410c480a6c20105749327b25a5 100644
--- a/dbrepo-ui/nuxt.config.js
+++ b/dbrepo-ui/nuxt.config.js
@@ -1,6 +1,6 @@
 import path from 'path'
 import colors from 'vuetify/es5/util/colors'
-import { api, icon, search, clientSecret, title, sandbox, logo, version, defaultPublisher } from './config'
+import { api, icon, search, clientSecret, title, sandbox, logo, version, defaultPublisher, doiUrl } from './config'
 
 const proxy = {}
 
@@ -92,7 +92,8 @@ export default {
     version,
     logo,
     clientSecret,
-    defaultPublisher
+    defaultPublisher,
+    doiUrl
   },
 
   serverMiddleware: [
diff --git a/dbrepo-user-service/Dockerfile b/dbrepo-user-service/Dockerfile
index f4fb17c5e43796c9bd1580ffacaa6539c73cdbec..58faa272f64d684f94956b9493202599fb36a547 100644
--- a/dbrepo-user-service/Dockerfile
+++ b/dbrepo-user-service/Dockerfile
@@ -16,7 +16,7 @@ COPY ./services ./services
 COPY ./report ./report
 
 # Make sure it compiles
-RUN mvn -q clean package -DskipTests > /dev/null
+RUN mvn -q clean package -DskipTests
 
 ###### THIRD STAGE ######
 FROM openjdk:11-jre-slim as runtime
diff --git a/docker-compose.yml b/docker-compose.yml
index f4364d1bb4c3212510867011ef3f6a753608fb4f..6f1c13cbb56724956cc7ee0fb78a66df7195fb6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -213,6 +213,8 @@ services:
       - "9096:9096"
     env_file:
       - .env
+    environment:
+      - SPRING_PROFILES_ACTIVE=doi
     depends_on:
       dbrepo-query-service:
         condition: service_healthy