diff --git a/.env b/.env
deleted file mode 100644
index b31ae9b..0000000
--- a/.env
+++ /dev/null
@@ -1,8 +0,0 @@
-# Rinkeby
-
-## Endpoints
-GRAPH_NODE_URL='https://eth.energi.network:8020'
-IPFS_NODE_URL='https://eth.energi.network:5001'
-
-## Subgraph
-SUBGRAPH_NAME='rinkeby/moonbase-alpha-bridge'
diff --git a/README.md b/README.md
index a63c329..d00274e 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,8 @@ yarn lint
 
 ## Settings
 
-- [x] Set endpoints, and subgraph-name in `.env` (for deployment to production graph-node) or `.env.local` (for deployment to local test graph-node) files. Check the `environments` folder for templates.
-- [x] Make sure `subgraph.yaml` refers to the same contracts and the same blockchain as `.env` / `.env.local`. Check the `manifests` folder for templates.
+- [x] Set endpoints, and subgraph-name in `.env.local` (for deployment to local test graph-node) files.
+- [x] Make sure `subgraph.yaml` refers to the same contracts and the same blockchain as `.env.local`. Check the `manifests` folder for templates.
 - [x] Ensure that the startblocks are the creation blocks of the related contracts in `subgraph.yaml`
 - [x] Set the correct chain in `src/config.ts` according to the blockchain you're intending to use by using comments.
 
diff --git a/environments/.env.kovan b/environments/.env.kovan
deleted file mode 100644
index 6158273..0000000
--- a/environments/.env.kovan
+++ /dev/null
@@ -1,8 +0,0 @@
-# Kovan
-
-## Endpoints
-GRAPH_NODE_URL='https://eth.test.energi.network:8020'
-IPFS_NODE_URL='https://eth.test.energi.network:5001'
-
-## Subgraph
-SUBGRAPH_NAME='kovan/moonbase-alpha-bridge'
diff --git a/environments/.env.rinkeby b/environments/.env.rinkeby
deleted file mode 100644
index ef702ef..0000000
--- a/environments/.env.rinkeby
+++ /dev/null
@@ -1,8 +0,0 @@
-# Rinkeby
-
-## Endpoints
-GRAPH_NODE_URL='https://eth.test.energi.network:8020'
-IPFS_NODE_URL='https://eth.test.energi.network:5001'
-
-## Subgraph
-SUBGRAPH_NAME='rinkeby/moonbase-alpha-bridge'
diff --git a/src/mappings/config.ts b/src/mappings/config.ts
index 2cf0411..2a2507c 100644
--- a/src/mappings/config.ts
+++ b/src/mappings/config.ts
@@ -4,14 +4,12 @@ export const DEFAULT_ADMIN_ROLE =
   '0x1effbbff9c66c5e59634f24fe842750c60d18891155c32dd155fc2d661a4c86d' // bytes32(keccak256(DEFAULT_ADMIN_ROLE))
 export const RELAYER_ROLE = '0xe2b7fb3b832174769106daebcfd6d1970523240dda11281102db9363b83b0dc4' // bytes32(keccak256(RELAYER_ROLE))
 
-/* Rinkeby */
+/* Rinkeby
 
 export const CHAIN_ID = 4
 export const BRIDGE = '0x638285e837db7124ff0947251c6f20ceeb2645df'
 
-/* Kovan
+/* Kovan */
 
 export const CHAIN_ID = 42
 export const BRIDGE = '0x638285e837db7124ff0947251c6f20ceeb2645df'
-
-*/
diff --git a/subgraph.yaml b/subgraph.yaml
index 8793793..bf9ed02 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -1,16 +1,16 @@
 specVersion: 0.0.4
-description: The Moonbase Alpha Bridge subgraph indexes all activity related to GMI Farming on Rinkeby
+description: The Moonbase Alpha Bridge subgraph indexes all activity related to GMI Farming on Kovan
 repository: https://github.com/TobyKreiselmaier/Moonbase-Alpha-Bridge-Subgraph
 schema:
   file: ./schema.graphql
 dataSources:
   - kind: ethereum/contract
     name: Bridge
-    network: rinkeby
+    network: kovan
     source:
-      address: '0x638285e837db7124ff0947251c6f20ceeb2645df' # MoonbeamBridge on Rinkeby
+      address: '0x638285e837db7124ff0947251c6f20ceeb2645df' # MoonbeamBridge on Kovan
       abi: Bridge
-      startBlock: 8660132 # contract creation
+      startBlock: 25101423 # contract creation
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6