diff --git a/smartgears/home_library/defaults/main.yml b/smartgears/home_library/defaults/main.yml
index fd39dd44..df16b298 100644
--- a/smartgears/home_library/defaults/main.yml
+++ b/smartgears/home_library/defaults/main.yml
@@ -85,6 +85,7 @@ jackrabbit_cluster_db_user: 'ws-db-journal-user'
 # jackrabbit_cluster_db_password: ''
 jackrabbit_cluster_db_url: 'jdbc:{{ jackrabbit_cluster_db_type }}://{{ jackrabbit_cluster_db_host }}/{{ jackrabbit_cluster_db_name }}'
 jackrabbit_cluster_db_tableprefix: 'journal_'
+jackrabbit_cluster_node_id: '{{ ansible_fqdn }}'
 # Set it to true if we want to clean the journal daily
 jackrabbit_cluster_janitor_enabled: 'false'
 
diff --git a/smartgears/home_library/templates/repository.xml.j2 b/smartgears/home_library/templates/repository.xml.j2
index 5747bbc7..3621370e 100644
--- a/smartgears/home_library/templates/repository.xml.j2
+++ b/smartgears/home_library/templates/repository.xml.j2
@@ -95,7 +95,7 @@
       </PersistenceManager>
    </Versioning>
    <!-- Cluster configuration -->
-   <Cluster id="node1" syncDelay="2000">
+   <Cluster id="{{ jackrabbit_cluster_node_id }}" syncDelay="2000">
       <Journal class="org.apache.jackrabbit.core.journal.DatabaseJournal">
          <param name="driver" value="{{ jackrabbit_cluster_db_driver }}" />
          <param name="url" value="{{ jackrabbit_cluster_db_url }}" />