Please fill in the following information:

Issue description

 Description:  On Step 4.5 it says:
Verify the environment variable configuration.

[student@workstation ~]$ oc describe deploy/expense-service | \
grep -A4 Environment
Environment:
 DATABASE_NAME:  Optional: false
 QUARKUS_DATASOURCE_PASSWORD:  Optional: false
 QUARKUS_DATASOURCE_USERNAME:  Optional: false
 QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://postgresql:5432/$(DATABASE_NAME)

However, it is database-pass not database-password as you can see in 4.3
 - name: QUARKUS_DATASOURCE_PASSWORD
 valueFrom:
 secretKeyRef:
 key: database-pass
 name: postgresql

Second bug:
If you do so, it says "$(DATABASE_NAME)" not found. If you do an "oc debug deployment/expense-service" and do an "echo $DATABASE_NAME" it does actually give out sampledb.
In the logs it says $DATABASE_NAME. This is clearly a bug. If you change the jdbc string from $DATABASE_NAME to sampledb it will connect.

This is very frustrating. 

Steps to reproduce:

Workaround:

Expected result: