diff --git a/.travis.yml b/.travis.yml
index 4ac12576..d5800da7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,25 @@
-stages:
-  - "Tests"
-  - "docker-compose integration tests"
-
+dist: bionic
+language: shell
+os: linux
 jobs:
   include:
     - stage: "Tests"
       name: "Admin tests"
       language: node_js
-      node_js:
-        - "8"
+      node_js: "12"
       cache:
         directories:
           - node_modules
       before_install:
         - cd admin
       install:
-        - yarn
+        - yarn install
       script:
         - yarn test && yarn build
 
     - name: "Backend tests"
       language: python
-      python:
-        - 3.6
+      python: "3.6"
       cache:
         pip: true
       services:
@@ -31,22 +28,21 @@ jobs:
       before_install:
         - cd backend
       install:
-        - pip install pytest==4.3.0 pytest-cov coveralls
+        - pip install pytest==4.* pytest-cov coveralls
         - pip install -r requirements.txt
       script:
         - PYTHONPATH=`pwd` pytest --cov=src
 
     - name: "Frontend tests"
       language: python
-      python:
-        - 3.6
+      python: "3.6"
       cache:
         pip: true
       before_install:
         - cd frontend
       install:
         - pip install -r requirements.txt
-        - pip install pytest py-w3c
+        - pip install pytest==4.* py-w3c
       script:
         - BACKEND_URL=https://www.research-software.nl/api PYTHONPATH=. pytest --live
 
@@ -58,3 +54,7 @@ jobs:
         - docker-compose build
       script:
         - docker-compose --file docker-compose.yml --file docker-compose.test.yml run test
+
+stages:
+  - "Tests"
+  - "docker-compose integration tests"
diff --git a/admin/Dockerfile b/admin/Dockerfile
index dde5ca5a..43fada07 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8.11.1
+FROM node:12.15.0
 
 RUN mkdir /app
 
diff --git a/admin/public/settings.json b/admin/public/settings.json
index 73df60e0..206ddf8e 100644
--- a/admin/public/settings.json
+++ b/admin/public/settings.json
@@ -19,10 +19,6 @@
           "help":
             "<p><b>Answer the following questions</b> (in Markdown with bullet points (*)):</p><ul><li>What does your software provide for what user?</li><li>What does your software do?</li><li>What makes your software unique?</li><li>List some highlights/awards:</li></ul><p>Example for Xenon:</p><p>* Provides an easy-to-use interface for distributed computing developers <br />* Enables the use of different file transfer protocols and scheduling systems on remote machines <br />* No need to learn and implement many different APIs<br/>* Successfully used in many eScience tools and projects</p>"
         },
-        "citationcff": {
-          "label": "citationcff",
-          "sortIndex": 300
-        },
         "contributingOrganizations": {
           "label": "Contributing organizations",
           "sortIndex": 400
@@ -57,16 +53,12 @@
         },
         "createdBy": {
           "label": "Created by",
-          "sortIndex": 1000,
+          "sortIndex": 1010,
           "readonly": true
         },
         "getStartedURL": {
           "label": "Getting started URL",
-          "sortIndex": 500
-        },
-        "repositoryURLs": {
-          "sortIndex": 580,
-          "label": "Code repository URLs"
+          "sortIndex": 510
         },
         "isFeatured": {
           "sortIndex": 20,
@@ -83,7 +75,7 @@
         },
         "primaryKey": {
           "label": "Primary key",
-          "sortIndex": 1000,
+          "sortIndex": 900,
           "readonly": true
         },
         "programmingLanguage": {
@@ -130,6 +122,10 @@
             }
           }
         },
+        "repositoryURLs": {
+          "sortIndex": 580,
+          "label": "Code repository URLs"
+        },
         "shortStatement": {
           "label": "Short statement",
           "multiline": true,
@@ -161,12 +157,12 @@
         },
         "updatedAt": {
           "label": "Updated at",
-          "sortIndex": 1000,
+          "sortIndex": 1020,
           "readonly": true
         },
         "updatedBy": {
           "label": "Updated by",
-          "sortIndex": 1000,
+          "sortIndex": 1030,
           "readonly": true
         }
       }
diff --git a/admin/src/__tests__/__snapshots__/storyshots.test.js.snap b/admin/src/__tests__/__snapshots__/storyshots.test.js.snap
index 410492a3..d68326e5 100644
--- a/admin/src/__tests__/__snapshots__/storyshots.test.js.snap
+++ b/admin/src/__tests__/__snapshots__/storyshots.test.js.snap
@@ -3687,7 +3687,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/software/topic-coherence-for-dutch"
+                href="/software/palmetto-position-lucene-wikipedia"
                 onClick={[Function]}
                 style={
                   Object {
@@ -3705,7 +3705,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/software/palmetto-position-lucene-wikipedia"
+                href="/software/topic-coherence-for-dutch"
                 onClick={[Function]}
                 style={
                   Object {
@@ -5640,7 +5640,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/person/5ab8c31085414f2cfd644a1d"
+                href="/person/5ab8c31085414f2cfd644a14"
                 onClick={[Function]}
                 style={
                   Object {
@@ -5658,7 +5658,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/person/5ab8c31085414f2cfd644a14"
+                href="/person/5ab8c31085414f2cfd644a1d"
                 onClick={[Function]}
                 style={
                   Object {
@@ -6468,7 +6468,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/person/5ab8c31085414f2cfd644a06"
+                href="/person/5ab8c31085414f2cfd644a02"
                 onClick={[Function]}
                 style={
                   Object {
@@ -6486,7 +6486,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/person/5ab8c31085414f2cfd644a02"
+                href="/person/5ab8c31085414f2cfd644a06"
                 onClick={[Function]}
                 style={
                   Object {
@@ -8483,7 +8483,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/D4IQJB4I"
+                href="/mention/TZPQQZJ2"
                 onClick={[Function]}
                 style={
                   Object {
@@ -8501,7 +8501,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/TZPQQZJ2"
+                href="/mention/D4IQJB4I"
                 onClick={[Function]}
                 style={
                   Object {
@@ -9527,7 +9527,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/WQYQ7LDM"
+                href="/mention/6HR2GJVP"
                 onClick={[Function]}
                 style={
                   Object {
@@ -9545,7 +9545,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/6HR2GJVP"
+                href="/mention/WQYQ7LDM"
                 onClick={[Function]}
                 style={
                   Object {
@@ -10175,7 +10175,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/ZU4GXGWK"
+                href="/mention/XR4JDULA"
                 onClick={[Function]}
                 style={
                   Object {
@@ -10193,7 +10193,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/XR4JDULA"
+                href="/mention/ZU4GXGWK"
                 onClick={[Function]}
                 style={
                   Object {
@@ -10445,7 +10445,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/I2P2KWMJ"
+                href="/mention/TWMAPGKF"
                 onClick={[Function]}
                 style={
                   Object {
@@ -10463,7 +10463,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/TWMAPGKF"
+                href="/mention/I2P2KWMJ"
                 onClick={[Function]}
                 style={
                   Object {
@@ -13235,7 +13235,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/JX6R7C8L"
+                href="/mention/KNQRNJWP"
                 onClick={[Function]}
                 style={
                   Object {
@@ -13271,7 +13271,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/Z3PRMJP4"
+                href="/mention/DK4NIGVN"
                 onClick={[Function]}
                 style={
                   Object {
@@ -13289,7 +13289,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/KNQRNJWP"
+                href="/mention/Z3PRMJP4"
                 onClick={[Function]}
                 style={
                   Object {
@@ -13307,7 +13307,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/DK4NIGVN"
+                href="/mention/JX6R7C8L"
                 onClick={[Function]}
                 style={
                   Object {
@@ -14063,7 +14063,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/YKISRDC9"
+                href="/mention/X7NG2ZGP"
                 onClick={[Function]}
                 style={
                   Object {
@@ -14081,7 +14081,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/X7NG2ZGP"
+                href="/mention/YKISRDC9"
                 onClick={[Function]}
                 style={
                   Object {
@@ -14585,7 +14585,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/JYZX65ZG"
+                href="/mention/YIXWJYQJ"
                 onClick={[Function]}
                 style={
                   Object {
@@ -14603,7 +14603,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/4XST6VUM"
+                href="/mention/JYZX65ZG"
                 onClick={[Function]}
                 style={
                   Object {
@@ -14621,7 +14621,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/YIXWJYQJ"
+                href="/mention/4XST6VUM"
                 onClick={[Function]}
                 style={
                   Object {
@@ -15269,7 +15269,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/6WURICLY"
+                href="/mention/VHF7VSK7"
                 onClick={[Function]}
                 style={
                   Object {
@@ -15287,7 +15287,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/VHF7VSK7"
+                href="/mention/6WURICLY"
                 onClick={[Function]}
                 style={
                   Object {
@@ -16349,7 +16349,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/TL4FCCQC"
+                href="/mention/ZV6MC3RR"
                 onClick={[Function]}
                 style={
                   Object {
@@ -16367,7 +16367,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/ZV6MC3RR"
+                href="/mention/TL4FCCQC"
                 onClick={[Function]}
                 style={
                   Object {
@@ -16457,7 +16457,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/B22553AW"
+                href="/mention/Y5BPFWXU"
                 onClick={[Function]}
                 style={
                   Object {
@@ -16475,7 +16475,7 @@ exports[`Storyshots Menu Full menu 1`] = `
             >
               <a
                 draggable={false}
-                href="/mention/Y5BPFWXU"
+                href="/mention/B22553AW"
                 onClick={[Function]}
                 style={
                   Object {
@@ -22289,7 +22289,7 @@ exports[`Storyshots Menu ResourceList 1`] = `
   >
     <a
       draggable={false}
-      href="/software/topic-coherence-for-dutch"
+      href="/software/palmetto-position-lucene-wikipedia"
       onClick={[Function]}
       style={
         Object {
@@ -22307,7 +22307,7 @@ exports[`Storyshots Menu ResourceList 1`] = `
   >
     <a
       draggable={false}
-      href="/software/palmetto-position-lucene-wikipedia"
+      href="/software/topic-coherence-for-dutch"
       onClick={[Function]}
       style={
         Object {
@@ -26095,7 +26095,7 @@ exports[`Storyshots Menu ResourceType 1`] = `
           >
             <a
               draggable={false}
-              href="/software/topic-coherence-for-dutch"
+              href="/software/palmetto-position-lucene-wikipedia"
               onClick={[Function]}
               style={
                 Object {
@@ -26113,7 +26113,7 @@ exports[`Storyshots Menu ResourceType 1`] = `
           >
             <a
               draggable={false}
-              href="/software/palmetto-position-lucene-wikipedia"
+              href="/software/topic-coherence-for-dutch"
               onClick={[Function]}
               style={
                 Object {
@@ -27801,7 +27801,7 @@ exports[`Storyshots Resource/Software empty 1`] = `
               <label
                 className="sc-EHOje jpYqWO"
               >
-                Getting started URL
+                Concept DOI
               </label>
               <div
                 style={
@@ -27810,6 +27810,14 @@ exports[`Storyshots Resource/Software empty 1`] = `
                   }
                 }
               >
+                <div
+                  className="sc-bdVaJa hjasLL"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "The <a href=\\"https://help.zenodo.org/#versioning\\">Zenodo concept DOI</a>. Not an URL",
+                    }
+                  }
+                />
                 <div
                   className="ui large input sc-bxivhb jcNPuI"
                 >
@@ -27849,7 +27857,7 @@ exports[`Storyshots Resource/Software empty 1`] = `
               <label
                 className="sc-EHOje jpYqWO"
               >
-                Concept DOI
+                Getting started URL
               </label>
               <div
                 style={
@@ -27858,14 +27866,6 @@ exports[`Storyshots Resource/Software empty 1`] = `
                   }
                 }
               >
-                <div
-                  className="sc-bdVaJa hjasLL"
-                  dangerouslySetInnerHTML={
-                    Object {
-                      "__html": "The <a href=\\"https://help.zenodo.org/#versioning\\">Zenodo concept DOI</a>. Not an URL",
-                    }
-                  }
-                />
                 <div
                   className="ui large input sc-bxivhb jcNPuI"
                 >
@@ -28810,12 +28810,12 @@ exports[`Storyshots Resource/Software empty 1`] = `
             }
           >
             <div
-              className="sc-ifAKCX bNIpav"
+              className="sc-hMqMXs iLsirh"
             >
               <label
-                className="sc-EHOje jpYqWO"
+                className="sc-kEYyzF bZRYDN"
               >
-                Updated by
+                Primary key
               </label>
               <div
                 style={
@@ -28824,17 +28824,9 @@ exports[`Storyshots Resource/Software empty 1`] = `
                   }
                 }
               >
-                <div
-                  className="ui large disabled input sc-bxivhb jcNPuI"
-                >
-                  <input
-                    defaultValue="Tommos0"
-                    disabled={true}
-                    onChange={[Function]}
-                    tabIndex={-1}
-                    type="text"
-                  />
-                </div>
+                software
+                 / 
+                some random id
               </div>
             </div>
             <div
@@ -28906,12 +28898,12 @@ exports[`Storyshots Resource/Software empty 1`] = `
             }
           >
             <div
-              className="sc-hMqMXs iLsirh"
+              className="sc-ifAKCX bNIpav"
             >
               <label
-                className="sc-kEYyzF bZRYDN"
+                className="sc-EHOje jpYqWO"
               >
-                Primary key
+                Updated by
               </label>
               <div
                 style={
@@ -28920,9 +28912,17 @@ exports[`Storyshots Resource/Software empty 1`] = `
                   }
                 }
               >
-                software
-                 / 
-                some random id
+                <div
+                  className="ui large disabled input sc-bxivhb jcNPuI"
+                >
+                  <input
+                    defaultValue="Tommos0"
+                    disabled={true}
+                    onChange={[Function]}
+                    tabIndex={-1}
+                    type="text"
+                  />
+                </div>
               </div>
             </div>
             <div
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 0e2ed5d0..dfe028ba 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   admin:
-    image: node:9.11.1-alpine
+    image: node:12.15.0-alpine
 
   test:
     build:
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 945292f0..09533da4 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:9.11.1-alpine
+FROM node:12.15.0-alpine
 RUN apk update && apk --no-cache add docker yarn
 RUN mkdir /tests
 WORKDIR /tests