diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8be81d49..3f1821be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
         tar xvfz influx_nightly_linux_amd64.tar.gz
         sudo cp influx_nightly_linux_amd64/{influx,influxd} /usr/local/bin/
         influxd --reporting-disabled > /dev/null 2>&1 &
-        sleep 5
+        until curl -s http://localhost:8086/health; do sleep 1; done
         influx setup -f -b dummy -o influxdata -u ci_user -p password
         cd $GITHUB_WORKSPACE
         find $GITHUB_WORKSPACE \( ! -path '*/.*' \) -type f -name "*.yml" -print0 | while read -d $'\0' file
diff --git a/README.md b/README.md
index b0c39138..52dd9eda 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Start by reading [how to use a template](docs/use_a_template.md), then check eac
 | [Docker](docker/) | Monitor your running docker containers. | [@russorat](https://github.com/russorat) |
 | [Downsampling](downsampling/) | Downsample common Telegraf metrics. | [@russorat](https://github.com/russorat) |
 | [Endpoint Security State](endpoint-security-state/) | Watch endpoint authentication availability and certificate status | [Darin Fisher](https://github.com/darinfisher) |
-| [Enviro+](enviro_plus/) | View the air quality readings from a Pimoroni Enviro+ particulate matter sensor. | Simon Loffler |
+| [Enviro+](enviro_plus/) | View the air quality readings from a Pimoroni Enviro+ particulate matter sensor. | Russ Savage |
 | [Fortnite](fortnite/) | Track and analyze Fortnite player performance. | [@abalone23](https://github.com/abalone23) |
 | [GCP Monitoring](gcp_monitoring/) | Monitor Google Cloud Platform.  | [bonitoo.io](.) |
 | [Github](github/) | View information about your Github Repos. Forks, Issues, Stars and more. | [Ignacio Van Droogenbroeck](https://github.com/xe-nvdk) |
diff --git a/enviro_plus/enviro_plus.json b/enviro_plus/enviro_plus.json
deleted file mode 100644
index bd4d42ea..00000000
--- a/enviro_plus/enviro_plus.json
+++ /dev/null
@@ -1,848 +0,0 @@
-{
- "meta": {
-  "version": "1",
-  "type": "dashboard",
-  "name": "Enviro Plus-Template",
-  "description": "template created from dashboard: Enviro Plus"
- },
- "content": {
-  "data": {
-   "type": "dashboard",
-   "attributes": {
-    "name": "Enviro Plus",
-    "description": "A template for viewing Air Quality data from a Pimoroni Enviro+"
-   },
-   "relationships": {
-    "label": {
-     "data": [
-      {
-       "type": "label",
-       "id": "0585c6fd00ebc000"
-      },
-      {
-       "type": "label",
-       "id": "0585c70f6d76c000"
-      },
-      {
-       "type": "label",
-       "id": "0585c720f3385000"
-      }
-     ]
-    },
-    "cell": {
-     "data": [
-      {
-       "type": "cell",
-       "id": "0585c657efcd3000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f1895000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f2abc000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f482a000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f6b71000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f7f6c000"
-      },
-      {
-       "type": "cell",
-       "id": "0585c657f90d7000"
-      }
-     ]
-    },
-    "variable": {
-     "data": []
-    }
-   }
-  },
-  "included": [
-   {
-    "type": "label",
-    "id": "0585c6fd00ebc000",
-    "attributes": {
-     "name": "air quality",
-     "properties": {
-      "color": "#326BBA",
-      "description": ""
-     }
-    }
-   },
-   {
-    "type": "label",
-    "id": "0585c70f6d76c000",
-    "attributes": {
-     "name": "raspberry pi",
-     "properties": {
-      "color": "#c6f98e",
-      "description": ""
-     }
-    }
-   },
-   {
-    "type": "label",
-    "id": "0585c720f3385000",
-    "attributes": {
-     "name": "enviro+",
-     "properties": {
-      "color": "#FFF6B8",
-      "description": ""
-     }
-    }
-   },
-   {
-    "id": "0585c657efcd3000",
-    "type": "cell",
-    "attributes": {
-     "x": 8,
-     "y": 4,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657efcd3000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f1895000",
-    "type": "cell",
-    "attributes": {
-     "x": 0,
-     "y": 0,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f1895000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f2abc000",
-    "type": "cell",
-    "attributes": {
-     "x": 8,
-     "y": 0,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f2abc000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f482a000",
-    "type": "cell",
-    "attributes": {
-     "x": 4,
-     "y": 0,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f482a000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f6b71000",
-    "type": "cell",
-    "attributes": {
-     "x": 4,
-     "y": 4,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f6b71000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f7f6c000",
-    "type": "cell",
-    "attributes": {
-     "x": 0,
-     "y": 8,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f7f6c000"
-      }
-     }
-    }
-   },
-   {
-    "id": "0585c657f90d7000",
-    "type": "cell",
-    "attributes": {
-     "x": 0,
-     "y": 4,
-     "w": 4,
-     "h": 4
-    },
-    "relationships": {
-     "view": {
-      "data": {
-       "type": "view",
-       "id": "0585c657f90d7000"
-      }
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657efcd3000",
-    "attributes": {
-     "name": "Lux",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"lux\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f1895000",
-    "attributes": {
-     "name": "Temperature",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"temperature\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "bd5fbcde-e573-486e-877e-c9d39f3d861f",
-        "type": "scale",
-        "hex": "#31C0F6",
-        "name": "Nineteen Eighty Four",
-        "value": 0
-       },
-       {
-        "id": "876225c9-f052-41a0-a568-340b03b85bdd",
-        "type": "scale",
-        "hex": "#A500A5",
-        "name": "Nineteen Eighty Four",
-        "value": 0
-       },
-       {
-        "id": "87c2f992-50a7-4829-8508-935db92cd31a",
-        "type": "scale",
-        "hex": "#FF7E27",
-        "name": "Nineteen Eighty Four",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f2abc000",
-    "attributes": {
-     "name": "Gas",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"oxidising\" or r[\"_field\"] == \"reducing\" or r[\"_field\"] == \"nh3\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f482a000",
-    "attributes": {
-     "name": "PM",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"pm1\" or r[\"_field\"] == \"pm10\" or r[\"_field\"] == \"pm25\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f6b71000",
-    "attributes": {
-     "name": "Pressure",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"pressure\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f7f6c000",
-    "attributes": {
-     "name": "Proximity",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"proximity\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   },
-   {
-    "type": "view",
-    "id": "0585c657f90d7000",
-    "attributes": {
-     "name": "Humidity",
-     "properties": {
-      "shape": "chronograf-v2",
-      "queries": [
-       {
-        "text": "from(bucket: \"enviroplus\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_measurement\"] == \"enviroplus\")\n  |> filter(fn: (r) => r[\"_field\"] == \"humidity\")",
-        "editMode": "advanced",
-        "name": "",
-        "builderConfig": {
-         "buckets": [],
-         "tags": [
-          {
-           "key": "_measurement",
-           "values": [],
-           "aggregateFunctionType": "filter"
-          }
-         ],
-         "functions": [],
-         "aggregateWindow": {
-          "period": "auto"
-         }
-        }
-       }
-      ],
-      "axes": {
-       "x": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       },
-       "y": {
-        "bounds": [
-         "",
-         ""
-        ],
-        "label": "",
-        "prefix": "",
-        "suffix": "",
-        "base": "10",
-        "scale": "linear"
-       }
-      },
-      "type": "xy",
-      "legend": {},
-      "geom": "line",
-      "colors": [
-       {
-        "id": "dc881a2a-64c4-48a0-8459-986eb34a8f4b",
-        "type": "scale",
-        "hex": "#74D495",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "5f877b35-a475-40d2-ada5-afd1036dc8eb",
-        "type": "scale",
-        "hex": "#3F3FBA",
-        "name": "Atlantis",
-        "value": 0
-       },
-       {
-        "id": "d0b44767-a446-417a-b77b-9be3d6759087",
-        "type": "scale",
-        "hex": "#FF4D9E",
-        "name": "Atlantis",
-        "value": 0
-       }
-      ],
-      "note": "",
-      "showNoteWhenEmpty": false,
-      "xColumn": "_time",
-      "yColumn": "_value",
-      "shadeBelow": true,
-      "position": "overlaid",
-      "timeFormat": ""
-     }
-    }
-   }
-  ]
- },
- "labels": []
-}
\ No newline at end of file
diff --git a/enviro_plus/enviro_plus.yml b/enviro_plus/enviro_plus.yml
new file mode 100644
index 00000000..0c9274fa
--- /dev/null
+++ b/enviro_plus/enviro_plus.yml
@@ -0,0 +1,271 @@
+apiVersion: influxdata.com/v2alpha1
+kind: Label
+metadata:
+    name: raspberry-pi-label
+spec:
+    color: '#c6f98e'
+    name: raspberry pi
+---
+apiVersion: influxdata.com/v2alpha1
+kind: Label
+metadata:
+    name: enviro-plus-label
+spec:
+    color: '#FFF6B8'
+    name: enviro+
+---
+apiVersion: influxdata.com/v2alpha1
+kind: Label
+metadata:
+    name: air-quality-label
+spec:
+    color: '#326BBA'
+    name: air quality
+---
+apiVersion: influxdata.com/v2alpha1
+kind: Dashboard
+metadata:
+    name: enviro-plus-dashboard
+spec:
+    associations:
+      - kind: Label
+        name: raspberry-pi-label
+      - kind: Label
+        name: enviro-plus-label
+      - kind: Label
+        name: air-quality-label
+    charts:
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#31C0F6'
+            name: Nineteen Eighty Four
+            type: scale
+          - hex: '#A500A5'
+            name: Nineteen Eighty Four
+            type: scale
+          - hex: '#FF7E27'
+            name: Nineteen Eighty Four
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Temperature
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "temperature")
+        shade: true
+        width: 4
+        xCol: _time
+        yCol: _value
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Humidity
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "humidity")
+        shade: true
+        width: 4
+        xCol: _time
+        yCol: _value
+        yPos: 4
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Proximity
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "proximity")
+        shade: true
+        width: 4
+        xCol: _time
+        yCol: _value
+        yPos: 8
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: PM
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "pm1" or r["_field"] == "pm10" or r["_field"] == "pm25")
+        shade: true
+        width: 4
+        xCol: _time
+        xPos: 4
+        yCol: _value
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Pressure
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "pressure")
+        shade: true
+        width: 4
+        xCol: _time
+        xPos: 4
+        yCol: _value
+        yPos: 4
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Gas
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "oxidising" or r["_field"] == "reducing" or r["_field"] == "nh3")
+        shade: true
+        width: 4
+        xCol: _time
+        xPos: 8
+        yCol: _value
+      - axes:
+          - base: "10"
+            name: x
+            scale: linear
+          - base: "10"
+            name: y
+            scale: linear
+        colors:
+          - hex: '#74D495'
+            name: Atlantis
+            type: scale
+          - hex: '#3F3FBA'
+            name: Atlantis
+            type: scale
+          - hex: '#FF4D9E'
+            name: Atlantis
+            type: scale
+        geom: line
+        height: 4
+        kind: Xy
+        name: Lux
+        position: overlaid
+        queries:
+          - query: |-
+                from(bucket: "enviroplus")
+                  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)
+                  |> filter(fn: (r) => r["_measurement"] == "enviroplus")
+                  |> filter(fn: (r) => r["_field"] == "lux")
+        shade: true
+        width: 4
+        xCol: _time
+        xPos: 8
+        yCol: _value
+        yPos: 4
+    description: A template for viewing Air Quality data from a Pimoroni Enviro+
+    name: Enviro Plus
diff --git a/enviro_plus/readme.md b/enviro_plus/readme.md
index 118ca07d..2268d16d 100644
--- a/enviro_plus/readme.md
+++ b/enviro_plus/readme.md
@@ -1,7 +1,5 @@
 # Enviro+
 
-Provided by: Simon Loffler
-
 View the air quality readings from a [Pimoroni Enviro+](https://shop.pimoroni.com/products/enviro-plus) with a [PMS5003](https://shop.pimoroni.com/products/pms5003-particulate-matter-sensor-with-cable) particulate matter sensor.
 
 ![Enviro+ dashboard](img/enviro-plus-influxdb-template.png)
@@ -11,7 +9,7 @@ View the air quality readings from a [Pimoroni Enviro+](https://shop.pimoroni.co
 If you have your InfluxDB credentials [configured in the CLI](Vhttps://v2.docs.influxdata.com/v2.0/reference/cli/influx/config/), you can install this template with:
 
 ```
-influx apply -u https://raw.githubusercontent.com/influxdata/community-templates/master/enviro_plus/enviro_plus.json
+influx apply -u https://raw.githubusercontent.com/influxdata/community-templates/master/enviro_plus/enviro_plus.yml
 ```
 
 ## Included Resources
@@ -44,7 +42,12 @@ ENV DEBUG="true"
 
 ## Contact
 
-- Author: Simon Loffler
-- Email: sighmon@sighmon.com
-- Github: @sighmon
-- Influx Slack: @sighmon
+- Original Author: Simon Loffler
+- Original Email: sighmon@sighmon.com
+- Original Github: [@sighmon](https://github.com/sighmon)
+- Original Influx Slack: [@sighmon](https://influxdata.com/slack)
+
+- Maintainer: Russ Savage
+- Email: russ@influxdata.com
+- Github: [@russorat](https://github.com/russorat)
+- Influx Slack: [@russ](https://influxdata.com/slack)
diff --git a/fortnite/fn-template.yml b/fortnite/fn-template.yml
index 5d46968a..e60660d1 100755
--- a/fortnite/fn-template.yml
+++ b/fortnite/fn-template.yml
@@ -37,13 +37,14 @@ spec:
         import "strings"
         import "influxdata/influxdb/secrets"
 
-
-
         webhook = secrets.get(key: "SLACK_WEBHOOK")
         sendSlackMessage = (text) =>
         	(slack.message(
         		url: webhook,
-        		token: "",
+                token: "",
+        		username: "",
+        		workspace: "",
+        		iconEmoji: "",
         		channel: "",
         		text: text,
         		color: "good",