diff --git a/container/templates/container/container_details.html b/container/templates/container/container_details.html
index e4d957e..1f0b679 100644
--- a/container/templates/container/container_details.html
+++ b/container/templates/container/container_details.html
@@ -1,4 +1,4 @@
 <h1>Container: {{ container.named_id }}</h1>
 <div>{{ container.description }}</div>
 <div>Color: {{ container.color }}</div>
-<div>Container Type: <a href='/container/type/{{ container.container_type.id }}'>{{ container.container_type.named_id }}</a></div>
+<div>Container Type: <a href="{% url 'container_type_details' container.container_type.id %}">{{ container.container_type.named_id }}</a></div>
diff --git a/container/templates/container/index.html b/container/templates/container/index.html
index d0ee396..4bb3d08 100644
--- a/container/templates/container/index.html
+++ b/container/templates/container/index.html
@@ -3,7 +3,7 @@
 {% if container_list %}
     <ul>
     {% for container in container_list %}
-        <li><a href="/container/{{ container.id }}/">{{ container.named_id }} {{ container.description }}</a></li>
+        <li><a href="{% url 'container_details' container.id %}">{{ container.named_id }}: {{ container.description }}</a></li>
     {% endfor %}
     </ul>
 {% else %}
@@ -15,7 +15,7 @@
 {% if container_type_list %}
     <ul>
     {% for ctype in container_type_list %}
-        <li><a href="/container/type/{{ ctype.id }}/">{{ ctype.named_id }} {{ ctype.description }}</a></li>
+        <li><a href="{% url 'container_type_details' ctype.id %}">{{ ctype.named_id }} {{ ctype.description }}</a></li>
     {% endfor %}
     </ul>
 {% else %}