diff --git a/Dockerfile.mug b/Dockerfile.mug
index 9d18f7f..9c1874d 100644
--- a/Dockerfile.mug
+++ b/Dockerfile.mug
@@ -12,18 +12,19 @@ COPY ./themes/MUG/invenio.cfg ${INVENIO_INSTANCE_PATH}
 
 RUN invenio collect --verbose && invenio webpack create
 
-# Now copy remaining instance files (these can override/extend the discovered bundles)
+# copy remaining instance files (these can override/extend the discovered bundles)
 COPY ./app_data/ ${INVENIO_INSTANCE_PATH}/app_data/
 COPY ./assets/ ${INVENIO_INSTANCE_PATH}/assets/
 COPY ./static/ ${INVENIO_INSTANCE_PATH}/static/
 COPY ./translations ${INVENIO_INSTANCE_PATH}/translations/
 COPY ./templates ${INVENIO_INSTANCE_PATH}/templates/
 
-COPY themes/MUG/templates/ ${INVENIO_INSTANCE_PATH}/templates/
+# copy MUG-specific templates (e.g., comment-template.html)
+COPY ./themes/MUG/templates/ ${INVENIO_INSTANCE_PATH}/templates/
 
 # Replace variables.less
-COPY ./themes/MUG/variables.less /opt/env/lib/python3.12/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/variables.less
-COPY ./themes/MUG/overrides.less /opt/env/lib/python3.12/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/overrides.less
+COPY themes/MUG/variables.less /opt/env/lib/python3.12/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/variables.less
+COPY themes/MUG/overrides.less /opt/env/lib/python3.12/site-packages/invenio_override/assets/semantic-ui/less/invenio_override/overrides.less
 
 WORKDIR ${INVENIO_INSTANCE_PATH}/assets
 RUN pnpm install
@@ -41,10 +42,10 @@ COPY --from=builder ${INVENIO_INSTANCE_PATH}/templates ${INVENIO_INSTANCE_PATH}/
 
 WORKDIR ${WORKING_DIR}/src
 COPY ./docker/uwsgi/ ${INVENIO_INSTANCE_PATH}
-# invenio.cfg already copied in builder stage, but ensure it's in final location
+# invenio.cfg already copied in builder stage, ensure it's in final location
 COPY ./themes/MUG/invenio.cfg ${INVENIO_INSTANCE_PATH}
 RUN chown invenio:invenio .
 
 USER invenio
 
-ENTRYPOINT [ "bash", "-c"]
+ENTRYPOINT [ "bash", "-c"]
\ No newline at end of file
diff --git a/templates/comment-template.html b/themes/MUG/templates/comment-template.html
similarity index 100%
rename from templates/comment-template.html
rename to themes/MUG/templates/comment-template.html
diff --git a/themes/MUG/templates/semantic-ui/invenio_app_rdm/records/deposit.html b/themes/MUG/templates/semantic-ui/invenio_app_rdm/records/deposit.html
deleted file mode 100644
index cf03373..0000000
--- a/themes/MUG/templates/semantic-ui/invenio_app_rdm/records/deposit.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{%- extends config.BASE_TEMPLATE %}
-
-{%- if community and community.theme and community.theme.enabled %}
-  {%- block css %}
-  {{ super() }}
-  <link rel="stylesheet" type="text/css" href="/communities/{{community.slug}}/community-theme-{{ community.revision_id }}.css">
-  {%- endblock %}
-{%- endif %}
-
-{%- if not record.is_published and record.versions.index and record.versions.index > 1 %}
-  {%- set title = _("New version") %}
-{%- elif not record.is_published %}
-  {%- set title = _("New upload") %}
-{% else %}
-  {%- set title = _("Edit upload") %}
-{%- endif %}
-
-{%- block page_body %}
-
-{%- if community_use_jinja_header %}
-{%- include "invenio_communities/details/header.html" %}
-{%- endif %}
-
-  {%- if record %}
-    <input id="deposits-record" type="hidden" name="deposits-record"
-           value='{{ record | tojson }}'>
-
-    <input id="deposits-record-locked-files" type="hidden"
-           name="deposits-record-locked-files"
-           value='{{ files_locked | tojson }}'>
-  {%- endif %}
-
-  {%- if preselectedCommunity %}
-    <input id="deposits-draft-community" type="hidden" name="deposits-draft-community"
-           value='{{ preselectedCommunity | tojson }}'>
-  {%- endif %}
-
-  {%- if files %}
-    <input id="deposits-record-files" type="hidden" name="deposits-record-files"
-           value='{{ files | tojson }}'>
-  {%- endif %}
-
-  {%- if forms_config %}
-    <input type="hidden" name="deposits-config"
-           value='{{ forms_config | tojson }}'>
-  {%- endif %}
-
-  {%- if permissions %}
-    <input id="deposits-record-permissions" type="hidden"
-           name="deposits-record-permissions"
-           value='{{ permissions | tojson }}'>
-  {%- endif %}
-
-  <div id="deposit-form"></div>
-
-{%- endblock page_body %}
-
-{%- block javascript %}
-  {{ super() }}
-  {{ webpack['invenio-app-rdm-deposit.js'] }}
-  {{ webpack['invenio-curations-deposit.js'] }}
-{%- endblock %}