diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile
index 213302876c15f3..ee9ad6ffae03be 100644
--- a/share/spack/templates/container/Dockerfile
+++ b/share/spack/templates/container/Dockerfile
@@ -43,6 +43,9 @@ RUN find -L {{ paths.view }}/* -type f -exec readlink -f '{}' \; | \
 RUN cd {{ paths.environment }} && \
     spack env activate --sh -d . > activate.sh
 
+{% if extra_instructions.build %}
+{{ extra_instructions.build }}
+{% endif %}
 {% endblock build_stage %}
 {% endif %}
 
@@ -75,6 +78,10 @@ RUN {% if os_package_update %}{{ os_packages_final.update }} \
  && {% endif %}{{ os_packages_final.install }} {{ os_packages_final.list | join | replace('\n', ' ') }} \
  && {{ os_packages_final.clean }}
 {% endif %}
+{% if extra_instructions.final %}
+
+{{ extra_instructions.final }}
+{% endif %}
 {% endblock final_stage %}
 {% for label, value in labels.items() %}
 LABEL "{{ label }}"="{{ value }}"