diff --git a/layout/atom.j2 b/layout/atom.j2
index 4848312..d4f175e 100644
--- a/layout/atom.j2
+++ b/layout/atom.j2
@@ -1,15 +1,16 @@
 {% from "macros.j2" import render_excerpt, render_post with context %}
+{% from "macros.j2" import fullurl with context %}
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title>
         {% block title %}{{ resource.meta.title|default(feed_title) }}{% endblock %}
     </title>
     {% block self_url %}
-    <link href="{{ resource.url }}" rel="self" />
+    <link type="application/atom+xml" href="{{ fullurl(resource.url) }}" rel="self" />
     {% endblock %}
 
     {% block site_url %}
-    <link href="{{ content_url('') }}"/>
+    <link rel="alternate" type="text/html" href="{{ fullur('/') }}"/>
     {% endblock %}
 
     {% block feed_extra %}
@@ -17,7 +18,7 @@
 
     <updated>{{ time_now|xmldatetime }}</updated>
 
-    <id>{{ content_url(resource.url) }}/</id>
+    <id>{{ fullurl(resource.url) }}</id>
 
     {% for res in resource.node.walk_resources_sorted_by_time() %}
         <entry>
@@ -26,9 +27,9 @@
             <link href="{{ content_url(res.url) }}"/>
             <updated>{{ res.meta.created|xmldatetime }}</updated>
             <published>{{ res.meta.created|xmldatetime }}</published>
-            <id>{{ content_url(res.url) }}</id>
+            <id>{{ fullurl(res.url) }}</id>
             {% for tag in res.meta.tags %}
-            <category   scheme="{{ content_url('search/label') }}"
+            <category   scheme="{{ fullurl('search/label') }}"
                         term="{{tag}}"
                         label="{{ tag|title }}" />
             {% endfor %}
diff --git a/layout/macros.j2 b/layout/macros.j2
index e643fba..3739ad2 100644
--- a/layout/macros.j2
+++ b/layout/macros.j2
@@ -2,6 +2,8 @@
 {{ res.meta.id if res.meta.id else res.slug }}{% endmacro %}
 {% macro itemurl(res) %}
 {{ res.url ~ "#" ~ (res.meta.id if res.meta.id else res.slug) ~ "-title" }}{% endmacro %}
+{% macro fullurl(part) %}
+{{ site.context.scheme_host ~ part }}{% endmacro %}
 
 {# endmacro not on new line to prevent white space at end of macro #}
 
diff --git a/site.yaml b/site.yaml
index 8651972..60871b5 100644
--- a/site.yaml
+++ b/site.yaml
@@ -11,6 +11,7 @@ plugins:
     - hyde.ext.plugins.text.TextlinksPlugin
 context:
     data:
+        scheme_host: https://blogtest.funkthat.com
         viewport: width=device-width, initial-scale=1
         tweet_via: encthenet
         title: encthenet ramblings